Skip to content

Commit

Permalink
chore!: bump MSRV to 1.71.1 (#3353)
Browse files Browse the repository at this point in the history
  • Loading branch information
TomAFrench authored Oct 30, 2023
1 parent 0e530cf commit 78f2127
Show file tree
Hide file tree
Showing 16 changed files with 18 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-pr-rebuild-script.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.66.0
uses: dtolnay/rust-toolchain@1.71.1

- uses: Swatinem/rust-cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.66.0
uses: dtolnay/rust-toolchain@1.71.1
with:
targets: ${{ matrix.target }}
components: clippy, rustfmt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gates_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.66.0
uses: dtolnay/rust-toolchain@1.71.1

- uses: Swatinem/rust-cache@v2
with:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/publish-acvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ jobs:
ref: ${{ inputs.acvm-ref }}

- name: Setup toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.66.0
uses: dtolnay/[email protected]

# These steps are in a specific order so crate dependencies are updated first
- name: Publish acir_field
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-nargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx$(sw_vers -productVersion) --show-sdk-platform-version)" >> $GITHUB_ENV
- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.66.0
uses: dtolnay/rust-toolchain@1.71.1
with:
targets: ${{ matrix.target }}

Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
ref: ${{ inputs.tag || env.GITHUB_REF }}

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.66.0
uses: dtolnay/rust-toolchain@1.71.1
with:
targets: ${{ matrix.target }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.66.0
uses: dtolnay/rust-toolchain@1.71.1

- uses: Swatinem/rust-cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-noir-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: ./.github/actions/setup

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.66.0
uses: dtolnay/rust-toolchain@1.71.1
with:
targets: wasm32-unknown-unknown

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-noir_wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.66.0
uses: dtolnay/rust-toolchain@1.71.1

- uses: Swatinem/rust-cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-rust-workspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.66.0
uses: dtolnay/rust-toolchain@1.71.1
with:
targets: ${{ matrix.target }}

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Concretely the following items are on the road map:

## Minimum Rust version

This crate's minimum supported rustc version is 1.66.0.
This crate's minimum supported rustc version is 1.71.1.

## Working on this project

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/getting_started/00_nargo_installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ code .
#### Building and testing

Assuming you are using `direnv` to populate your environment, building and testing the project can be done
with the typical `cargo build`, `cargo test`, and `cargo clippy` commands. You'll notice that the `cargo` version matches the version we specify in `flake.nix`, which is 1.66.0 at the time of this writing.
with the typical `cargo build`, `cargo test`, and `cargo clippy` commands. You'll notice that the `cargo` version matches the version we specify in `rust-toolchain.toml`, which is 1.71.1 at the time of this writing.
If you want to build the entire project in an isolated sandbox, you can use Nix commands:
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

rustToolchain = fenix.packages.${system}.fromToolchainFile {
file = ./rust-toolchain.toml;
sha256 = "sha256-Zk2rxv6vwKFkTTidgjPm6gDsseVmmljVt201H7zuDkk=";
sha256 = "sha256-R0F0Risbr74xg9mEYydyebx/z0Wu6HI0/KWwrV30vZo=";
};

craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "1.66.1"
channel = "1.71.1"
components = [ "rust-src" ]
targets = [ "wasm32-unknown-unknown", "wasm32-wasi", "aarch64-apple-darwin" ]
profile = "default"
4 changes: 2 additions & 2 deletions tooling/nargo/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use rustc_version::{version, Version};

fn check_rustc_version() {
assert!(
version().unwrap() >= Version::parse("1.66.0").unwrap(),
"The minimal supported rustc version is 1.66.0."
version().unwrap() >= Version::parse("1.71.1").unwrap(),
"The minimal supported rustc version is 1.71.1."
);
}

Expand Down
4 changes: 2 additions & 2 deletions tooling/nargo_cli/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ use std::{env, fs};

fn check_rustc_version() {
assert!(
version().unwrap() >= Version::parse("1.66.0").unwrap(),
"The minimal supported rustc version is 1.66.0."
version().unwrap() >= Version::parse("1.71.1").unwrap(),
"The minimal supported rustc version is 1.71.1."
);
}

Expand Down
1 change: 0 additions & 1 deletion tooling/nargo_fmt/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ impl FindToken for str {
Lexer::new(self)
.skip_comments(false)
.flatten()
.into_iter()
.find_map(|spanned| f(spanned.token()).then(|| spanned.to_span().end()))
}
}
Expand Down

0 comments on commit 78f2127

Please sign in to comment.