From fef9cf04d292019eadc2ec3ec8e0ec59271d872b Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 28 Oct 2023 14:14:26 -0500 Subject: [PATCH] rust: bump MSRV to 1.76.0 Signed-off-by: Austin Seipp --- .github/workflows/build.yml | 2 +- CHANGELOG.md | 2 ++ Cargo.toml | 2 +- cli/tests/test_git_clone.rs | 1 - docs/contributing.md | 6 +++--- flake.nix | 2 +- lib/src/default_index/revset_graph_iterator.rs | 2 +- lib/src/tree_builder.rs | 2 +- lib/tests/test_local_working_copy.rs | 4 ---- lib/tests/test_revset.rs | 5 ----- 10 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cd32877a79..a0d0b14c28 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 with: - toolchain: 1.71 + toolchain: 1.76 - name: Build run: cargo build --workspace --all-targets --verbose ${{ matrix.cargo_flags }} - name: Test diff --git a/CHANGELOG.md b/CHANGELOG.md index 5eee4f705c..fcf54f08e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Breaking changes +* The minimum supported Rust version (MSRV) is now 1.76.0. + ### New features * Templates now support logical operators: `||`, `&&`, `!` diff --git a/Cargo.toml b/Cargo.toml index 3ef924b5b8..9029c55cf3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ members = ["cli", "lib", "lib/testutils", "lib/gen-protos"] [workspace.package] version = "0.14.0" license = "Apache-2.0" -rust-version = "1.71" # NOTE: remember to update CI, contributing.md, changelog.md, and flake.nix +rust-version = "1.76" # NOTE: remember to update CI, contributing.md, changelog.md, and flake.nix edition = "2021" readme = "README.md" homepage = "https://github.com/martinvonz/jj" diff --git a/cli/tests/test_git_clone.rs b/cli/tests/test_git_clone.rs index d77a2fb2af..dbf756459c 100644 --- a/cli/tests/test_git_clone.rs +++ b/cli/tests/test_git_clone.rs @@ -198,7 +198,6 @@ fn test_git_clone_colocate() { .symbolic_target() ); // ".jj" directory should be ignored at Git side. - #[allow(unknown_lints)] // Needed for clippy <=1.71 #[allow(clippy::format_collect)] let git_statuses: String = jj_git_repo .statuses(None) diff --git a/docs/contributing.md b/docs/contributing.md index 8c989fb548..c4c75c6448 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -122,7 +122,7 @@ jj config set --repo "revset-aliases.immutable_heads()" "main@origin | gh-pages@ One-time setup: rustup toolchain add nightly # wanted for 'rustfmt' - rustup toolchain add 1.71 # also specified in Cargo.toml + rustup toolchain add 1.76 # also specified in Cargo.toml cargo install cargo-insta cargo install cargo-watch cargo install cargo-nextest @@ -131,7 +131,7 @@ During development (adapt according to your preference): cargo watch --ignore '.jj/**' -s \ 'cargo clippy --workspace --all-targets \ - && cargo +1.71 check --workspace --all-targets' + && cargo +1.76 check --workspace --all-targets' cargo +nightly fmt # Occasionally cargo nextest run --workspace # Occasionally cargo insta test --workspace --test-runner nextest # Occasionally @@ -160,7 +160,7 @@ These are listed roughly in order of decreasing importance. 3. Your code will be rejected if it cannot be compiled with the minimal supported version of Rust ("MSRV"). Currently, `jj` follows a rather casual MSRV policy: "The current `rustc` stable version, minus one." - As of this writing, that version is **1.71.0**. + As of this writing, that version is **1.76.0**. 4. Your code needs to pass `cargo clippy`. You can also use `cargo +nightly clippy` if you wish to see more warnings. diff --git a/flake.nix b/flake.nix index fba7b9b258..4f6e32c7e2 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,7 @@ pkgs.lib.all (re: builtins.match re relPath == null) regexes; }; - rust-version = pkgs.rust-bin.stable."1.71.0".default; + rust-version = pkgs.rust-bin.stable."1.76.0".default; ourRustPlatform = pkgs.makeRustPlatform { rustc = rust-version; diff --git a/lib/src/default_index/revset_graph_iterator.rs b/lib/src/default_index/revset_graph_iterator.rs index 78d3cf825a..7d02bc58ab 100644 --- a/lib/src/default_index/revset_graph_iterator.rs +++ b/lib/src/default_index/revset_graph_iterator.rs @@ -167,7 +167,7 @@ impl<'revset, 'index> RevsetGraphIterator<'revset, 'index> { index_entry: &IndexEntry<'index>, ) -> &[IndexGraphEdge] { let position = index_entry.position(); - // `if let Some(edges) = ...` doesn't pass lifetime check as of Rust 1.71.0 + // `if let Some(edges) = ...` doesn't pass lifetime check as of Rust 1.76.0 if self.edges.contains_key(&position) { return self.edges.get(&position).unwrap(); } diff --git a/lib/src/tree_builder.rs b/lib/src/tree_builder.rs index 30ddfd33da..71ec1c077f 100644 --- a/lib/src/tree_builder.rs +++ b/lib/src/tree_builder.rs @@ -129,7 +129,7 @@ impl TreeBuilder { store: &Arc, dir: &RepoPath, ) -> &'a Tree { - // `if let Some(tree) = ...` doesn't pass lifetime check as of Rust 1.69.0 + // `if let Some(tree) = ...` doesn't pass lifetime check as of Rust 1.76.0 if tree_cache.contains_key(dir) { return tree_cache.get(dir).unwrap(); } diff --git a/lib/tests/test_local_working_copy.rs b/lib/tests/test_local_working_copy.rs index ea3746eed3..6405ee7e26 100644 --- a/lib/tests/test_local_working_copy.rs +++ b/lib/tests/test_local_working_copy.rs @@ -12,10 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// TODO: Remove when MSRV passes 1.72 -// https://github.com/frondeus/test-case/issues/126#issuecomment-1635916592 -#![allow(clippy::items_after_test_module)] - use std::fs::OpenOptions; use std::io::Write; #[cfg(unix)] diff --git a/lib/tests/test_revset.rs b/lib/tests/test_revset.rs index d58ec17846..ac8a7973fc 100644 --- a/lib/tests/test_revset.rs +++ b/lib/tests/test_revset.rs @@ -12,11 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// this was supposed to be fixed in 1.71.0, but barely missed the cut. -// can be released after we bump MSRV to 1.72.0, see: -// https://github.com/frondeus/test-case/issues/126#issuecomment-1635916592 -#![allow(clippy::items_after_test_module)] - use std::path::Path; use assert_matches::assert_matches;