diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b534363e9..54bb0008e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -60,12 +60,12 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - toolchain: [1.73.0, 1.66.0] + toolchain: [1.73.0, 1.70.0] include: - os: windows-latest toolchain: 1.73.0-x86_64-pc-windows-gnu - os: windows-latest - toolchain: 1.66.0-x86_64-pc-windows-gnu + toolchain: 1.70.0-x86_64-pc-windows-gnu runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 diff --git a/Cargo.lock b/Cargo.lock index 667c8b850..6b590c505 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -34,16 +34,15 @@ checksum = "ca77caf0ca1057c274cda103cda1363d892b7cad5f2e646afde4df0697bea100" [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] @@ -73,9 +72,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.2" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys", @@ -184,33 +183,31 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.3.24" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb690e81c7840c0d7aade59f242ea3b41b9bc27bcd5997890e7702ae4b32e487" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.3.24" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ed2e96bc16d8d740f6f48d663eddf4b8a0983e79210fd55479b7bcd0a69860e" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", "clap_lex", - "once_cell", "strsim", ] [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", @@ -220,9 +217,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "colorchoice" @@ -450,7 +447,6 @@ dependencies = [ "hex", "hex-literal", "indexmap", - "is-terminal", "itertools", "libc", "libz-sys", @@ -511,12 +507,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - [[package]] name = "hex" version = "0.4.3" @@ -549,17 +539,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", -] - [[package]] name = "itertools" version = "0.11.0" diff --git a/Cargo.toml b/Cargo.toml index b1a7a28c7..4993aa512 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ authors = ["Mike Hommey "] edition = "2021" license = "MPL-2.0 AND GPL-2.0" repository = "https://github.com/glandium/git-cinnabar" -rust-version = "1.66.0" +rust-version = "1.70.0" include = [ "/src", "/build.rs", @@ -44,7 +44,6 @@ git-version = "0.3" hex = "0.4" hex-literal = "0.4" indexmap = "2" -is-terminal = "0.4" itertools = "0.11" libc = "0.2" once_cell = "1.13" @@ -62,7 +61,7 @@ default-features = false features = ["std"] [dependencies.clap] -version = "4.0,<4.4" # Avoid MSRV bump to 1.70. +version = "4.0" features = ["cargo", "derive"] [target.'cfg(windows)'.dependencies.curl-sys] diff --git a/README.md b/README.md index ce208a2db..2c6ebe2e1 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Requirements: - Git (any version should work ; cinnabarclone bundles require 1.4.4). - In order to build from source: - - Rust 1.66.0 or newer. + - Rust 1.70.0 or newer. - GCC or clang. Setup: diff --git a/src/main.rs b/src/main.rs index c9572a598..995dbd4db 100644 --- a/src/main.rs +++ b/src/main.rs @@ -86,7 +86,7 @@ use std::ffi::CString; use std::ffi::{CStr, OsStr, OsString}; use std::fs::File; use std::hash::Hash; -use std::io::{stdin, stdout, BufRead, BufWriter, Write}; +use std::io::{stdin, stdout, BufRead, BufWriter, IsTerminal, Write}; use std::iter::repeat; use std::os::raw::{c_char, c_int, c_void}; #[cfg(windows)] @@ -106,7 +106,6 @@ use cinnabar::{ use cstr::cstr; use git::{BlobId, CommitId, GitObjectId}; use git_version::git_version; -use is_terminal::IsTerminal; use graft::{graft_finish, grafted, init_graft}; use hg::{HgChangesetId, HgFileId, HgManifestId, ManifestEntry};