Skip to content

Commit 4af33a9

Browse files
authored
Rollup merge of #68626 - Zoxc:termize, r=estebank
Use termize instead of term_size `termize` is a fork of `term_size` which uses `winapi` 0.3 instead of 0.2. This is a step towards removing the `winapi` 0.2 dependency. r? @Mark-Simulacrum
2 parents f837c73 + b0b11d3 commit 4af33a9

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

Cargo.lock

+11-1
Original file line numberDiff line numberDiff line change
@@ -3540,8 +3540,8 @@ dependencies = [
35403540
"rustc_data_structures",
35413541
"rustc_span",
35423542
"serialize",
3543-
"term_size",
35443543
"termcolor",
3544+
"termize",
35453545
"unicode-width",
35463546
"winapi 0.3.8",
35473547
]
@@ -4580,6 +4580,16 @@ dependencies = [
45804580
"redox_termios",
45814581
]
45824582

4583+
[[package]]
4584+
name = "termize"
4585+
version = "0.1.1"
4586+
source = "registry+https://github.com/rust-lang/crates.io-index"
4587+
checksum = "1706be6b564323ce7092f5f7e6b118a14c8ef7ed0e69c8c5329c914a9f101295"
4588+
dependencies = [
4589+
"libc",
4590+
"winapi 0.3.8",
4591+
]
4592+
45834593
[[package]]
45844594
name = "test"
45854595
version = "0.0.0"

src/librustc_errors/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ unicode-width = "0.1.4"
1818
atty = "0.2"
1919
termcolor = "1.0"
2020
annotate-snippets = "0.6.1"
21-
term_size = "0.3.1"
21+
termize = "0.1.1"
2222

2323
[target.'cfg(windows)'.dependencies]
2424
winapi = { version = "0.3", features = ["handleapi", "synchapi", "winbase"] }

src/librustc_errors/emitter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1367,7 +1367,7 @@ impl EmitterWriter {
13671367
} else if self.ui_testing {
13681368
140
13691369
} else {
1370-
term_size::dimensions()
1370+
termize::dimensions()
13711371
.map(|(w, _)| w.saturating_sub(code_offset))
13721372
.unwrap_or(std::usize::MAX)
13731373
};

src/tools/tidy/src/deps.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ const WHITELIST: &[Crate<'_>] = &[
167167
Crate("termcolor"),
168168
Crate("terminon"),
169169
Crate("termion"),
170-
Crate("term_size"),
170+
Crate("termize"),
171171
Crate("thread_local"),
172172
Crate("ucd-util"),
173173
Crate("unicode-normalization"),

0 commit comments

Comments
 (0)