Update nu-ansi-term, lscolors, and reedline (#9787)

# Description
Now use `nu-ansi-term` 0.49
Small adjustments to accommodate breaking changes.


# User-Facing Changes
None
This commit is contained in:
Stefan Holderbach
2023-07-24 13:16:18 +02:00
committed by GitHub
parent 4d0b6d8821
commit d7ebe5fdc3
14 changed files with 32 additions and 37 deletions

View File

@ -24,7 +24,7 @@ nu-parser = { path = "../nu-parser", version = "0.82.1" }
nu-protocol = { path = "../nu-protocol", version = "0.82.1" }
nu-utils = { path = "../nu-utils", version = "0.82.1" }
nu-color-config = { path = "../nu-color-config", version = "0.82.1" }
nu-ansi-term = "0.47.0"
nu-ansi-term = "0.49.0"
reedline = { version = "0.21.0", features = ["bashisms", "sqlite"]}
chrono = { default-features = false, features = ["std"], version = "0.4" }

View File

@ -22,7 +22,7 @@ nu-utils = { path = "../nu-utils", version = "0.82.1" }
# Potential dependencies for extras
num-traits = "0.2"
ahash = "0.8.3"
nu-ansi-term = "0.48.0"
nu-ansi-term = "0.49.0"
fancy-regex = "0.11.0"
rust-embed = "6.7.0"
serde = "1.0.164"

View File

@ -16,7 +16,7 @@ nu-engine = { path = "../nu-engine", version = "0.82.1" }
nu-parser = { path = "../nu-parser", version = "0.82.1" }
nu-protocol = { path = "../nu-protocol", version = "0.82.1" }
nu-utils = { path = "../nu-utils", version = "0.82.1" }
nu-ansi-term = "0.47.0"
nu-ansi-term = "0.49.0"
fancy-regex = "0.11"
itertools = "0.10"

View File

@ -12,7 +12,7 @@ bench = false
[dependencies]
nu-protocol = { path = "../nu-protocol", version = "0.82.1" }
nu-ansi-term = "0.47.0"
nu-ansi-term = "0.49.0"
nu-utils = { path = "../nu-utils", version = "0.82.1" }
nu-engine = { path = "../nu-engine", version = "0.82.1" }
nu-json = { path="../nu-json", version = "0.82.1" }

View File

@ -26,5 +26,6 @@ fn merge_styles(base: Style, extra: Style) -> Style {
is_reverse: extra.is_reverse || base.is_reverse,
is_hidden: extra.is_hidden || base.is_hidden,
is_strikethrough: extra.is_strikethrough || base.is_strikethrough,
prefix_with_reset: false,
}
}

View File

@ -186,6 +186,7 @@ impl TextStyle {
is_reverse: style.is_reverse,
is_hidden: style.is_hidden,
is_strikethrough: style.is_strikethrough,
prefix_with_reset: false,
}),
}
}
@ -235,6 +236,7 @@ impl TextStyle {
is_reverse: style.is_reverse,
is_hidden: style.is_hidden,
is_strikethrough: style.is_strikethrough,
prefix_with_reset: false,
})
}
}

View File

@ -13,7 +13,7 @@ version = "0.82.1"
bench = false
[dependencies]
nu-ansi-term = "0.47.0"
nu-ansi-term = "0.49.0"
nu-cmd-base = { path = "../nu-cmd-base", version = "0.82.1" }
nu-color-config = { path = "../nu-color-config", version = "0.82.1" }
nu-engine = { path = "../nu-engine", version = "0.82.1" }
@ -53,7 +53,7 @@ indicatif = "0.17"
is-terminal = "0.4.8"
itertools = "0.10"
log = "0.4"
lscolors = { version = "0.14", default-features = false, features = ["nu-ansi-term"] }
lscolors = { version = "0.15", default-features = false, features = ["nu-ansi-term"] }
md5 = { package = "md-5", version = "0.10" }
miette = { version = "5.10", features = ["fancy-no-backtrace"] }
mime = "0.3"

View File

@ -11,7 +11,7 @@ version = "0.82.1"
bench = false
[dependencies]
nu-ansi-term = "0.47.0"
nu-ansi-term = "0.49.0"
nu-protocol = { path = "../nu-protocol", version = "0.82.1" }
nu-parser = { path = "../nu-parser", version = "0.82.1" }
nu-color-config = { path = "../nu-color-config", version = "0.82.1" }
@ -25,4 +25,4 @@ strip-ansi-escapes = "0.1"
crossterm = "0.26"
ratatui = "0.20"
ansi-str = "0.8"
lscolors = { version = "0.14", default-features = false, features = ["nu-ansi-term"] }
lscolors = { version = "0.15", default-features = false, features = ["nu-ansi-term"] }

View File

@ -317,6 +317,7 @@ const fn color(foreground: Option<Color>, background: Option<Color>) -> Style {
is_reverse: false,
is_strikethrough: false,
is_underline: false,
prefix_with_reset: false,
}
}

View File

@ -14,7 +14,7 @@ path = "src/lib.rs"
bench = false
[dependencies]
nu-ansi-term = "0.47.0"
nu-ansi-term = "0.49.0"
[dev-dependencies]
heapless = { version = "0.7", default-features = false }

View File

@ -15,7 +15,7 @@ nu-protocol = { path = "../nu-protocol", version = "0.82.1" }
nu-utils = { path = "../nu-utils", version = "0.82.1" }
nu-engine = { path = "../nu-engine", version = "0.82.1" }
nu-color-config = { path = "../nu-color-config", version = "0.82.1" }
nu-ansi-term = "0.47.0"
nu-ansi-term = "0.49.0"
tabled = { version = "0.12.2", features = ["color"], default-features = false }
[dev-dependencies]

View File

@ -18,7 +18,7 @@ bench = false
[dependencies]
log = "0.4"
lscolors = { version = "0.14", default-features = false, features = ["nu-ansi-term"] }
lscolors = { version = "0.15", default-features = false, features = ["nu-ansi-term"] }
num-format = { version = "0.4" }
strip-ansi-escapes = "0.1"
sys-locale = "0.3"