about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohn Kåre Alsaker <john.kare.alsaker@gmail.com>2020-01-29 01:13:48 +0100
committerJohn Kåre Alsaker <john.kare.alsaker@gmail.com>2020-01-29 01:13:48 +0100
commitb0b11d31a2cd4ff00973c17ff987c345301b2ebd (patch)
treee623638389cd2eb48593e072354ce0f044941f63
parent3761dcd3467441f78939ccb3b341b03b6a7558d7 (diff)
downloadrust-b0b11d31a2cd4ff00973c17ff987c345301b2ebd.tar.gz
rust-b0b11d31a2cd4ff00973c17ff987c345301b2ebd.zip
Use termize instead of term_size
-rw-r--r--Cargo.lock12
-rw-r--r--src/librustc_errors/Cargo.toml2
-rw-r--r--src/librustc_errors/emitter.rs2
-rw-r--r--src/tools/tidy/src/deps.rs2
4 files changed, 14 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 9c359b464ef..2c4063a5e56 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3540,8 +3540,8 @@ dependencies = [
  "rustc_data_structures",
  "rustc_span",
  "serialize",
- "term_size",
  "termcolor",
+ "termize",
  "unicode-width",
  "winapi 0.3.8",
 ]
@@ -4581,6 +4581,16 @@ dependencies = [
 ]
 
 [[package]]
+name = "termize"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1706be6b564323ce7092f5f7e6b118a14c8ef7ed0e69c8c5329c914a9f101295"
+dependencies = [
+ "libc",
+ "winapi 0.3.8",
+]
+
+[[package]]
 name = "test"
 version = "0.0.0"
 dependencies = [
diff --git a/src/librustc_errors/Cargo.toml b/src/librustc_errors/Cargo.toml
index 01ea80659d6..b8340b1a1df 100644
--- a/src/librustc_errors/Cargo.toml
+++ b/src/librustc_errors/Cargo.toml
@@ -18,7 +18,7 @@ unicode-width = "0.1.4"
 atty = "0.2"
 termcolor = "1.0"
 annotate-snippets = "0.6.1"
-term_size = "0.3.1"
+termize = "0.1.1"
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["handleapi", "synchapi", "winbase"] }
diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs
index bf660d188b2..f62922c6e20 100644
--- a/src/librustc_errors/emitter.rs
+++ b/src/librustc_errors/emitter.rs
@@ -1366,7 +1366,7 @@ impl EmitterWriter {
                 } else if self.ui_testing {
                     140
                 } else {
-                    term_size::dimensions()
+                    termize::dimensions()
                         .map(|(w, _)| w.saturating_sub(code_offset))
                         .unwrap_or(std::usize::MAX)
                 };
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index 352c00dbe41..ea92f7bee6b 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -167,7 +167,7 @@ const WHITELIST: &[Crate<'_>] = &[
     Crate("termcolor"),
     Crate("terminon"),
     Crate("termion"),
-    Crate("term_size"),
+    Crate("termize"),
     Crate("thread_local"),
     Crate("ucd-util"),
     Crate("unicode-normalization"),