diff --git a/Cargo.lock b/Cargo.lock index 4dc56a2..8708636 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -468,18 +468,18 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a6229bad892b46b0dcfaaeb18ad0d2e56400f5aaea05b768bde96e73676cf75" dependencies = [ - "unicode-width", + "unicode-width 0.1.11", ] [[package]] name = "papergrid" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7419ad52a7de9b60d33e11085a0fe3df1fbd5926aa3f93d3dd53afbc9e86725" +checksum = "d2b0f8def1f117e13c895f3eda65a7b5650688da29d6ad04635f61bc7b92eebd" dependencies = [ "bytecount", "fnv", - "unicode-width", + "unicode-width 0.2.0", ] [[package]] @@ -546,27 +546,25 @@ dependencies = [ ] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "proc-macro-error-attr2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" dependencies = [ - "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", - "version_check", ] [[package]] -name = "proc-macro-error-attr" -version = "1.0.4" +name = "proc-macro-error2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" dependencies = [ + "proc-macro-error-attr2", "proc-macro2", "quote", - "version_check", + "syn 2.0.82", ] [[package]] @@ -840,9 +838,9 @@ dependencies = [ [[package]] name = "tabled" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c9303ee60b9bedf722012ea29ae3711ba13a67c9b9ae28993838b63057cb1b" +checksum = "c6709222f3973137427ce50559cd564dc187a95b9cfe01613d2f4e93610e510a" dependencies = [ "papergrid", "tabled_derive", @@ -850,12 +848,12 @@ dependencies = [ [[package]] name = "tabled_derive" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0fb8bfdc709786c154e24a66777493fb63ae97e3036d914c8666774c477069" +checksum = "931be476627d4c54070a1f3a9739ccbfec9b36b39815106a20cce2243bbcefe1" dependencies = [ "heck", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 1.0.109", @@ -903,7 +901,7 @@ dependencies = [ "smawk", "terminal_size 0.2.6", "unicode-linebreak", - "unicode-width", + "unicode-width 0.1.11", ] [[package]] @@ -957,6 +955,12 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + [[package]] name = "utf8parse" version = "0.2.2" @@ -1105,12 +1109,6 @@ version = "0.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96f26868814bf1ca9deec910a08007c93eb1d8e407ce36451999d4c1c1ea6767" -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/Cargo.toml b/Cargo.toml index 62b21b0..36510ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,7 +53,7 @@ tempfile = "3.9.0" rand = { version = "0.8", features = ["small_rng"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.122" -tabled = "0.16.0" +tabled = "0.17.0" dns-lookup = "2.0.4" [dependencies] diff --git a/src/uu/lsmem/src/lsmem.rs b/src/uu/lsmem/src/lsmem.rs index 5622140..b7db93b 100644 --- a/src/uu/lsmem/src/lsmem.rs +++ b/src/uu/lsmem/src/lsmem.rs @@ -19,7 +19,7 @@ use tabled::{ settings::{ location::ByColumnName, object::{self, Rows}, - Alignment, Disable, Modify, Style, + Alignment, Modify, Remove, Style, }, Table, Tabled, }; @@ -500,11 +500,11 @@ fn print_table(lsmem: &Lsmem, opts: &Options) { .with(Modify::new(object::Columns::new(1..)).with(Alignment::right())); // the default version - table.with(Disable::column(ByColumnName::new("NODE"))); - table.with(Disable::column(ByColumnName::new("ZONES"))); + table.with(Remove::column(ByColumnName::new("NODE"))); + table.with(Remove::column(ByColumnName::new("ZONES"))); if opts.noheadings { - table.with(Disable::row(Rows::first())); + table.with(Remove::row(Rows::first())); } println!("{table}");