Skip to content

Commit

Permalink
Bump BSRV to 1.70.
Browse files Browse the repository at this point in the history
We can now upgrade to clap 4.4 and remove the is-terminal dependency.
  • Loading branch information
glandium committed Oct 30, 2023
1 parent bbf8179 commit 5487c3e
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 41 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
45 changes: 12 additions & 33 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ authors = ["Mike Hommey <[email protected]>"]
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",
Expand Down Expand Up @@ -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"
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand All @@ -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};
Expand Down

0 comments on commit 5487c3e

Please sign in to comment.