diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2023-06-08 10:15:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-08 10:15:10 +0200 |
| commit | 737dbb04d64645b73e3d6ce5a6e8a67df6706787 (patch) | |
| tree | 9ad544a410a5a7ff117f0dc0dfc9feaaeceea6e5 | |
| parent | ad9d7e3ed5066ed38917638014f276e869969044 (diff) | |
| parent | edf342afc6dc8358a0dcb8aeea4b4fa071864977 (diff) | |
| download | rust-737dbb04d64645b73e3d6ce5a6e8a67df6706787.tar.gz rust-737dbb04d64645b73e3d6ce5a6e8a67df6706787.zip | |
Rollup merge of #112309 - kadiwa4:remove_is_terminal, r=albertlarsan68
bootstrap: remove dependency `is-terminal`
| -rw-r--r-- | src/bootstrap/Cargo.lock | 13 | ||||
| -rw-r--r-- | src/bootstrap/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/bootstrap/config.rs | 3 |
3 files changed, 1 insertions, 16 deletions
diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock index 8f8778efee7..d48866d58ce 100644 --- a/src/bootstrap/Cargo.lock +++ b/src/bootstrap/Cargo.lock @@ -51,7 +51,6 @@ dependencies = [ "filetime", "hex", "ignore", - "is-terminal", "junction", "libc", "object", @@ -387,18 +386,6 @@ dependencies = [ ] [[package]] -name = "is-terminal" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys", -] - -[[package]] name = "itoa" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml index 367c6190967..85eb543e48e 100644 --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml @@ -30,7 +30,6 @@ path = "bin/sccache-plus-cl.rs" test = false [dependencies] -is-terminal = "0.4" build_helper = { path = "../tools/build_helper" } cmake = "0.1.38" filetime = "0.2" diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 8ea7e836375..2bc8441759f 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -12,6 +12,7 @@ use std::collections::{HashMap, HashSet}; use std::env; use std::fmt; use std::fs; +use std::io::IsTerminal; use std::path::{Path, PathBuf}; use std::process::Command; use std::str::FromStr; @@ -894,8 +895,6 @@ define_config! { impl Config { pub fn default_opts() -> Config { - use is_terminal::IsTerminal; - let mut config = Config::default(); config.llvm_optimize = true; config.ninja_in_file = true; |