on master help sign in
Revert "Use console 0.11.1, see #955"

This reverts commit d64c55ef114e80a3feb423a98590c3c569242410. The build on Windows failed due to two broken tests: line_numbers tabs_numbers

commitd707eab95cf6874a703743a7653233881c54cca4 authorsharkdp <davidpeter@web.de> dateTue 28 Apr 2020, 09:22 (7 years ago) parentd64c55e
2 files changed+17−16
Cargo.lock+16−15 Cargo.toml+1−1
Cargo.lock+16−15
@@ -121,7 +121,7 @@ dependencies = [
121121 "assert_cmd 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
122122 "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
123123 "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
124− "console 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
124+ "console 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
125125 "content_inspector 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
126126 "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
127127 "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -292,20 +292,30 @@ dependencies = [
292292 "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
293293]
294294
295+[[package]]
296+name = "clicolors-control"
297+version = "1.0.1"
298+source = "registry+https://github.com/rust-lang/crates.io-index"
299+dependencies = [
300+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
301+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
302+ "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
303+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
304+]
305+
295306[[package]]
296307name = "console"
297−version = "0.11.1"
308+version = "0.10.0"
298309source = "registry+https://github.com/rust-lang/crates.io-index"
299310dependencies = [
311+ "clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
300312 "encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
301313 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
302314 "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
303315 "regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
304− "terminal_size 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
305316 "termios 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
306317 "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
307318 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
308− "winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
309319]
310320
311321[[package]]
@@ -1257,15 +1267,6 @@ dependencies = [
12571267 "winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
12581268]
12591269
1260−[[package]]
1261−name = "terminal_size"
1262−version = "0.1.11"
1263−source = "registry+https://github.com/rust-lang/crates.io-index"
1264−dependencies = [
1265− "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
1266− "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
1267−]
1268−
12691270[[package]]
12701271name = "termios"
12711272version = "0.3.2"
@@ -1514,7 +1515,8 @@ dependencies = [
15141515"checksum chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
15151516"checksum clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853"
15161517"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
1517−"checksum console 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6186a012aed6b3ab3b36015337ecbc30563961181868a31b6314e97e36e3c36e"
1518+"checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e"
1519+"checksum console 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6728a28023f207181b193262711102bfbaf47cc9d13bc71d0736607ef8efe88c"
15181520"checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
15191521"checksum content_inspector 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38"
15201522"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
@@ -1632,7 +1634,6 @@ dependencies = [
16321634"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
16331635"checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"
16341636"checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
1635−"checksum terminal_size 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "248dbcb93f8697c50b85b0492cf559b94667eb24c26934eae73ae5673175ebf6"
16361637"checksum termios 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6f0fcee7b24a25675de40d5bb4de6e41b0df07bc9856295e7e2b3a3600c400c2"
16371638"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
16381639"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
Cargo.toml+1−1
@@ -39,7 +39,7 @@ regex-fancy = ["syntect/regex-fancy"] # Use the rust-only "fancy-regex" engine
3939atty = { version = "0.2.14", optional = true }
4040ansi_term = "^0.12.1"
4141ansi_colours = "^1.0"
42−console = "0.11.1"
42+console = "=0.10.0"
4343dirs = { version = "2.0", optional = true }
4444lazy_static = { version = "1.4", optional = true }
4545wild = { version = "2.0", optional = true }