From f2d4f15e304046c1799fdae841cb4d42e989d2a9 Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 19 Jul 2023 17:11:57 +0800 Subject: [PATCH] Replace `is-terminal` with std's and bump MSRV to 1.70 --- .github/workflows/ci.yaml | 2 +- Cargo.lock | 1 - Cargo.toml | 2 +- crates/nil/Cargo.toml | 1 - crates/nil/src/main.rs | 2 +- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8cff223..4e8a0e5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,7 +37,7 @@ jobs: include: - os: ubuntu-latest # Should be sync with Cargo.toml - channel: '1.68' + channel: '1.70' runs-on: ${{ matrix.os }} steps: - name: Checkout diff --git a/Cargo.lock b/Cargo.lock index fc7c55f..e9c7120 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -746,7 +746,6 @@ dependencies = [ "async-lsp", "codespan-reporting", "ide", - "is-terminal", "log", "lsp-types", "macro_rules_attribute", diff --git a/Cargo.toml b/Cargo.toml index deea8d6..8d595a5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ version = "0.0.0" edition = "2021" license = "MIT OR Apache-2.0" # Should be sync with CI. -rust-version = "1.68" +rust-version = "1.70" [profile.dev] debug = 1 diff --git a/crates/nil/Cargo.toml b/crates/nil/Cargo.toml index b704b4b..55bbd5d 100644 --- a/crates/nil/Cargo.toml +++ b/crates/nil/Cargo.toml @@ -11,7 +11,6 @@ argh = "0.1.10" async-lsp = "0.0.4" codespan-reporting = "0.11.1" ide = { path = "../ide" } -is-terminal = "0.4.7" log = "0.4.17" lsp-types = "0.94.0" macro_rules_attribute = "0.2.0" diff --git a/crates/nil/src/main.rs b/crates/nil/src/main.rs index 8d25dd8..2b6a264 100644 --- a/crates/nil/src/main.rs +++ b/crates/nil/src/main.rs @@ -2,7 +2,7 @@ use anyhow::{Context, Result}; use argh::FromArgs; use codespan_reporting::term::termcolor::WriteColor; use ide::{AnalysisHost, Severity}; -use is_terminal::IsTerminal; +use std::io::IsTerminal; use std::path::{Path, PathBuf}; use std::sync::Arc; use std::{env, fs, io, process};