Bump Rust version to 1.70 and remove atty dep

quickwit-oss · Jul 18, 2023 · 85c3470 · 85c3470
1 parent c39876c
commit 85c3470
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock
diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-rust-version = "1.69"
+rust-version = "1.70"
 members = [
   "quickwit-actors",
   "quickwit-aws",
@@ -44,7 +44,6 @@ arc-swap = "1.6"
 assert-json-diff = "2"
 async-speed-limit = "0.4"
 async-trait = "0.1"
-atty = "0.2"
 backoff = { version = "0.4", features = ["tokio"] }
 base64 = "0.21"
 byte-unit = { version = "4", default-features = false, features = ["serde", "std"] }

diff --git a/quickwit/quickwit-cli/Cargo.toml b/quickwit/quickwit-cli/Cargo.toml
@@ -21,7 +21,6 @@ path = "src/generate_markdown.rs"
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }
-atty = { workspace = true }
 byte-unit = { workspace = true }
 bytes = { workspace = true }
 chitchat = { workspace = true }

diff --git a/quickwit/quickwit-cli/src/tool.rs b/quickwit/quickwit-cli/src/tool.rs
@@ -18,7 +18,7 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 use std::collections::{HashSet, VecDeque};
-use std::io::{stdout, Stdout, Write};
+use std::io::{stdout, IsTerminal, Stdout, Write};
 use std::num::NonZeroUsize;
 use std::path::PathBuf;
 use std::str::FromStr;
@@ -370,8 +370,7 @@ pub async fn local_ingest_docs_cli(args: LocalIngestDocsArgs) -> anyhow::Result<
         .ask_for_res(DetachIndexingPipeline { pipeline_id })
         .await?;
 
-    let is_stdin_atty = atty::is(atty::Stream::Stdin);
-    if args.input_path_opt.is_none() && is_stdin_atty {
+    if args.input_path_opt.is_none() && io::stdin().is_terminal() {
         let eof_shortcut = match env::consts::OS {
             "windows" => "CTRL+Z",
             _ => "CTRL+D",

diff --git a/quickwit/rust-toolchain.toml b/quickwit/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.69"
+channel = "1.70"