extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-25 09:53:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicated dependency on ansi-str 0.7 (#9641)

Browse Source 
# Description
`tabled`/`papergrid` already use `ansi-str 0.8` while `nu-explore`
itself was still depending on `0.7`. Single fix necessary to adapt to
the new API.

cc @zhiburt

# User-Facing Changes
None
This commit is contained in:
Stefan Holderbach 2023-07-10 09:24:08 +02:00 committed by GitHub
parent 79a9751a58
commit 92354a817c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Cargo.lock generated
View File

@ -107,15 +107,6 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
[[package]]
name = "ansi-str"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21b1ed1c166829a0ccb5d79caa0f75cb4abd4adb2ce2c096755b7ad5ffdb0990"
dependencies = [
"ansitok",
]
[[package]] [[package]]
name = "ansi-str" name = "ansi-str"
version = "0.8.0" version = "0.8.0"
@ -2868,7 +2859,7 @@ dependencies = [
name = "nu-explore" name = "nu-explore"
version = "0.82.1" version = "0.82.1"
dependencies = [ dependencies = [
"ansi-str 0.7.2", "ansi-str",
"crossterm", "crossterm",
"lscolors", "lscolors",
"nu-ansi-term 0.47.0", "nu-ansi-term 0.47.0",
@ -3403,7 +3394,7 @@ version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae7891b22598926e4398790c8fe6447930c72a67d36d983a49d6ce682ce83290" checksum = "ae7891b22598926e4398790c8fe6447930c72a67d36d983a49d6ce682ce83290"
dependencies = [ dependencies = [
"ansi-str 0.8.0", "ansi-str",
"ansitok", "ansitok",
"bytecount", "bytecount",
"fnv", "fnv",
@ -5068,7 +5059,7 @@ version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ce69a5028cd9576063ec1f48edb2c75339fd835e6094ef3e05b3a079bf594a6" checksum = "0ce69a5028cd9576063ec1f48edb2c75339fd835e6094ef3e05b3a079bf594a6"
dependencies = [ dependencies = [
"ansi-str 0.8.0", "ansi-str",
"ansitok", "ansitok",
"papergrid", "papergrid",
"unicode-width", "unicode-width",

2
crates/nu-explore/Cargo.toml
View File

@ -24,5 +24,5 @@ terminal_size = "0.2"
strip-ansi-escapes = "0.1" strip-ansi-escapes = "0.1"
crossterm = "0.26" crossterm = "0.26"
ratatui = "0.20" ratatui = "0.20"
ansi-str = "0.7" ansi-str = "0.8"
lscolors = { version = "0.14", default-features = false, features = ["nu-ansi-term"] } lscolors = { version = "0.14", default-features = false, features = ["nu-ansi-term"] }

2
crates/nu-explore/src/views/coloredtextw.rs
View File

@ -69,7 +69,7 @@ fn cut_string(text: &str, area: Rect, skip: usize) -> Cow<'_, str> {
text text
} }
fn style_to_tui(style: ansi_str::Style) -> Style { fn style_to_tui(style: &ansi_str::Style) -> Style {
let mut out = Style::default(); let mut out = Style::default();
if let Some(clr) = style.background() { if let Some(clr) = style.background() {
out.bg = ansi_color_to_tui_color(clr); out.bg = ansi_color_to_tui_color(clr);