diff --git a/Cargo.lock b/Cargo.lock index 517fa8d..abc5798 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -706,8 +706,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" dependencies = [ "bit-set", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", + "regex-automata", + "regex-syntax", ] [[package]] @@ -1606,11 +1606,11 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "matchers" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" dependencies = [ - "regex-automata 0.1.10", + "regex-automata", ] [[package]] @@ -1653,12 +1653,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" dependencies = [ - "overload", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -1804,12 +1803,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "parking" version = "2.2.1" @@ -2100,17 +2093,8 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax", ] [[package]] @@ -2121,15 +2105,9 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.5", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.8.5" @@ -3110,14 +3088,14 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" dependencies = [ "matchers", "nu-ansi-term", "once_cell", - "regex", + "regex-automata", "serde", "serde_json", "sharded-slab", @@ -3334,28 +3312,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-core" version = "0.61.2" diff --git a/Cargo.nix b/Cargo.nix index 43465e6..3b14228 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -2140,13 +2140,13 @@ rec { } { name = "regex-automata"; - packageId = "regex-automata 0.4.9"; + packageId = "regex-automata"; usesDefaultFeatures = false; features = [ "alloc" "syntax" "meta" "nfa" "dfa" "hybrid" ]; } { name = "regex-syntax"; - packageId = "regex-syntax 0.8.5"; + packageId = "regex-syntax"; usesDefaultFeatures = false; } ]; @@ -5298,19 +5298,23 @@ rec { }; "matchers" = rec { crateName = "matchers"; - version = "0.1.0"; + version = "0.2.0"; edition = "2018"; - sha256 = "0n2mbk7lg2vf962c8xwzdq96yrc9i0p8dbmm4wa1nnkcp1dhfqw2"; + sha256 = "1sasssspdj2vwcwmbq3ra18d3qniapkimfcbr47zmx6750m5llni"; authors = [ "Eliza Weisman " ]; dependencies = [ { name = "regex-automata"; - packageId = "regex-automata 0.1.10"; + packageId = "regex-automata"; + usesDefaultFeatures = false; + features = [ "syntax" "dfa-build" "dfa-search" ]; } ]; - + features = { + "unicode" = [ "regex-automata/unicode" ]; + }; }; "matchit" = rec { crateName = "matchit"; @@ -5428,9 +5432,9 @@ rec { }; "nu-ansi-term" = rec { crateName = "nu-ansi-term"; - version = "0.46.0"; - edition = "2018"; - sha256 = "115sywxh53p190lyw97alm14nc004qj5jm5lvdj608z84rbida3p"; + version = "0.50.1"; + edition = "2021"; + sha256 = "16a3isvbxx8pa3lk71h3cq2fsx2d17zzq42j4mhpxy81gl2qx8nl"; libName = "nu_ansi_term"; authors = [ "ogham@bsago.me" @@ -5440,14 +5444,11 @@ rec { ]; dependencies = [ { - name = "overload"; - packageId = "overload"; - } - { - name = "winapi"; - packageId = "winapi"; - target = { target, features }: ("windows" == target."os" or null); - features = [ "consoleapi" "errhandlingapi" "fileapi" "handleapi" "processenv" ]; + name = "windows-sys"; + packageId = "windows-sys 0.52.0"; + rename = "windows"; + target = { target, features }: (target."windows" or false); + features = [ "Win32_Foundation" "Win32_System_Console" "Win32_Storage_FileSystem" "Win32_Security" ]; } ]; features = { @@ -6023,16 +6024,6 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "overload" = rec { - crateName = "overload"; - version = "0.1.1"; - edition = "2018"; - sha256 = "0fdgbaqwknillagy1xq7xfgv60qdbk010diwl7s1p0qx7hb16n5i"; - authors = [ - "Daniel Salvadori " - ]; - - }; "parking" = rec { crateName = "parking"; version = "2.2.1"; @@ -6828,13 +6819,13 @@ rec { } { name = "regex-automata"; - packageId = "regex-automata 0.4.9"; + packageId = "regex-automata"; usesDefaultFeatures = false; features = [ "alloc" "syntax" "meta" "nfa-pikevm" ]; } { name = "regex-syntax"; - packageId = "regex-syntax 0.8.5"; + packageId = "regex-syntax"; usesDefaultFeatures = false; } ]; @@ -6862,32 +6853,7 @@ rec { }; resolvedDefaultFeatures = [ "default" "perf" "perf-backtrack" "perf-cache" "perf-dfa" "perf-inline" "perf-literal" "perf-onepass" "std" "unicode" "unicode-age" "unicode-bool" "unicode-case" "unicode-gencat" "unicode-perl" "unicode-script" "unicode-segment" ]; }; - "regex-automata 0.1.10" = rec { - crateName = "regex-automata"; - version = "0.1.10"; - edition = "2015"; - sha256 = "0ci1hvbzhrfby5fdpf4ganhf7kla58acad9i1ff1p34dzdrhs8vc"; - libName = "regex_automata"; - authors = [ - "Andrew Gallant " - ]; - dependencies = [ - { - name = "regex-syntax"; - packageId = "regex-syntax 0.6.29"; - optional = true; - } - ]; - features = { - "default" = [ "std" ]; - "fst" = [ "dep:fst" ]; - "regex-syntax" = [ "dep:regex-syntax" ]; - "std" = [ "regex-syntax" ]; - "transducer" = [ "std" "fst" ]; - }; - resolvedDefaultFeatures = [ "default" "regex-syntax" "std" ]; - }; - "regex-automata 0.4.9" = rec { + "regex-automata" = rec { crateName = "regex-automata"; version = "0.4.9"; edition = "2021"; @@ -6912,7 +6878,7 @@ rec { } { name = "regex-syntax"; - packageId = "regex-syntax 0.8.5"; + packageId = "regex-syntax"; optional = true; usesDefaultFeatures = false; } @@ -6948,22 +6914,7 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "dfa" "dfa-build" "dfa-onepass" "dfa-search" "hybrid" "meta" "nfa" "nfa-backtrack" "nfa-pikevm" "nfa-thompson" "perf" "perf-inline" "perf-literal" "perf-literal-multisubstring" "perf-literal-substring" "std" "syntax" "unicode" "unicode-age" "unicode-bool" "unicode-case" "unicode-gencat" "unicode-perl" "unicode-script" "unicode-segment" "unicode-word-boundary" ]; }; - "regex-syntax 0.6.29" = rec { - crateName = "regex-syntax"; - version = "0.6.29"; - edition = "2018"; - sha256 = "1qgj49vm6y3zn1hi09x91jvgkl2b1fiaq402skj83280ggfwcqpi"; - libName = "regex_syntax"; - authors = [ - "The Rust Project Developers" - ]; - features = { - "default" = [ "unicode" ]; - "unicode" = [ "unicode-age" "unicode-bool" "unicode-case" "unicode-gencat" "unicode-perl" "unicode-script" "unicode-segment" ]; - }; - resolvedDefaultFeatures = [ "default" "unicode" "unicode-age" "unicode-bool" "unicode-case" "unicode-gencat" "unicode-perl" "unicode-script" "unicode-segment" ]; - }; - "regex-syntax 0.8.5" = rec { + "regex-syntax" = rec { crateName = "regex-syntax"; version = "0.8.5"; edition = "2021"; @@ -10484,9 +10435,9 @@ rec { }; "tracing-subscriber" = rec { crateName = "tracing-subscriber"; - version = "0.3.19"; + version = "0.3.20"; edition = "2018"; - sha256 = "0220rignck8072i89jjsh140vmh14ydwpdwnifyaf3xcnpn9s678"; + sha256 = "1m9447bxq7236avgl6n5yb2aqwplrghm61dgipw03mh7ad7s2m10"; libName = "tracing_subscriber"; authors = [ "Eliza Weisman " @@ -10510,11 +10461,11 @@ rec { optional = true; } { - name = "regex"; - packageId = "regex"; + name = "regex-automata"; + packageId = "regex-automata"; optional = true; usesDefaultFeatures = false; - features = [ "std" "unicode-case" "unicode-perl" ]; + features = [ "std" ]; } { name = "serde"; @@ -10566,12 +10517,6 @@ rec { } ]; devDependencies = [ - { - name = "regex"; - packageId = "regex"; - usesDefaultFeatures = false; - features = [ "std" ]; - } { name = "tracing"; packageId = "tracing"; @@ -10585,7 +10530,7 @@ rec { "ansi" = [ "fmt" "nu-ansi-term" ]; "chrono" = [ "dep:chrono" ]; "default" = [ "smallvec" "fmt" "ansi" "tracing-log" "std" ]; - "env-filter" = [ "matchers" "regex" "once_cell" "tracing" "std" "thread_local" ]; + "env-filter" = [ "matchers" "once_cell" "tracing" "std" "thread_local" "dep:regex-automata" ]; "fmt" = [ "registry" "std" ]; "json" = [ "tracing-serde" "serde" "serde_json" ]; "local-time" = [ "time/local-offset" ]; @@ -10593,7 +10538,6 @@ rec { "nu-ansi-term" = [ "dep:nu-ansi-term" ]; "once_cell" = [ "dep:once_cell" ]; "parking_lot" = [ "dep:parking_lot" ]; - "regex" = [ "dep:regex" ]; "registry" = [ "sharded-slab" "thread_local" "std" ]; "serde" = [ "dep:serde" ]; "serde_json" = [ "dep:serde_json" ]; @@ -10609,7 +10553,7 @@ rec { "valuable-serde" = [ "dep:valuable-serde" ]; "valuable_crate" = [ "dep:valuable_crate" ]; }; - resolvedDefaultFeatures = [ "alloc" "ansi" "default" "env-filter" "fmt" "json" "matchers" "nu-ansi-term" "once_cell" "regex" "registry" "serde" "serde_json" "sharded-slab" "smallvec" "std" "thread_local" "tracing" "tracing-log" "tracing-serde" ]; + resolvedDefaultFeatures = [ "alloc" "ansi" "default" "env-filter" "fmt" "json" "matchers" "nu-ansi-term" "once_cell" "registry" "serde" "serde_json" "sharded-slab" "smallvec" "std" "thread_local" "tracing" "tracing-log" "tracing-serde" ]; }; "try-lock" = rec { crateName = "try-lock"; @@ -11586,53 +11530,6 @@ rec { "serde" = [ "dep:serde" ]; }; }; - "winapi" = rec { - crateName = "winapi"; - version = "0.3.9"; - edition = "2015"; - sha256 = "06gl025x418lchw1wxj64ycr7gha83m44cjr5sarhynd9xkrm0sw"; - authors = [ - "Peter Atashian " - ]; - dependencies = [ - { - name = "winapi-i686-pc-windows-gnu"; - packageId = "winapi-i686-pc-windows-gnu"; - target = { target, features }: (target.name == "i686-pc-windows-gnu"); - } - { - name = "winapi-x86_64-pc-windows-gnu"; - packageId = "winapi-x86_64-pc-windows-gnu"; - target = { target, features }: (target.name == "x86_64-pc-windows-gnu"); - } - ]; - features = { - "debug" = [ "impl-debug" ]; - }; - resolvedDefaultFeatures = [ "consoleapi" "errhandlingapi" "fileapi" "handleapi" "processenv" ]; - }; - "winapi-i686-pc-windows-gnu" = rec { - crateName = "winapi-i686-pc-windows-gnu"; - version = "0.4.0"; - edition = "2015"; - sha256 = "1dmpa6mvcvzz16zg6d5vrfy4bxgg541wxrcip7cnshi06v38ffxc"; - libName = "winapi_i686_pc_windows_gnu"; - authors = [ - "Peter Atashian " - ]; - - }; - "winapi-x86_64-pc-windows-gnu" = rec { - crateName = "winapi-x86_64-pc-windows-gnu"; - version = "0.4.0"; - edition = "2015"; - sha256 = "0gqq64czqb64kskjryj8isp62m2sgvx25yyj3kpc2myh85w24bki"; - libName = "winapi_x86_64_pc_windows_gnu"; - authors = [ - "Peter Atashian " - ]; - - }; "windows-core" = rec { crateName = "windows-core"; version = "0.61.2";