Skip to content

Commit 70b1272

Browse files
authored
Update to Rust 1.75, fix clippy lints (#1021)
This change updates the minimum version of Rust supported for local dev and used in the pipelines to 1.75. It also fixes one remaining clippy lint that is new to 1.75.
1 parent dc8e4d3 commit 70b1272

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

.ado/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pr: none
55

66
variables:
77
CARGO_TERM_COLOR: always
8-
RUST_TOOLCHAIN_VERSION: "1.73"
8+
RUST_TOOLCHAIN_VERSION: "1.75"
99

1010
# variables set by pipeline
1111
# - BASE_IMAGE

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ env:
2020
CARGO_TERM_COLOR: always
2121
NODE_VERSION: "18.17.1"
2222
PYTHON_VERSION: "3.11"
23-
RUST_TOOLCHAIN_VERSION: "1.73"
23+
RUST_TOOLCHAIN_VERSION: "1.75"
2424
RUST_TOOLCHAIN_COMPONENTS: rustfmt clippy
2525

2626
jobs:

.github/workflows/publish-playground.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
env:
1313
CARGO_TERM_COLOR: always
14-
RUST_TOOLCHAIN_VERSION: "1.73"
14+
RUST_TOOLCHAIN_VERSION: "1.75"
1515
RUST_TOOLCHAIN_COMPONENTS: rustfmt clippy
1616

1717
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages

compiler/qsc_fir/src/fir.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,15 @@ impl PackageStore {
521521
}
522522
}
523523

524+
impl<'a> IntoIterator for &'a PackageStore {
525+
type IntoIter = qsc_data_structures::index_map::Iter<'a, PackageId, Package>;
526+
type Item = (PackageId, &'a Package);
527+
528+
fn into_iter(self) -> Self::IntoIter {
529+
self.iter()
530+
}
531+
}
532+
524533
/// A trait to find elements in a package.
525534
pub trait PackageLookup {
526535
/// Gets a block.

prereqs.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
import functools
1414

1515
python_ver = (3, 11) # Python support for Windows on ARM64 requires v3.11 or later
16-
rust_ver = (1, 73) # Ensure Rust version 1.73 or later is installed
16+
rust_ver = (1, 75) # Ensure Rust version 1.75 or later is installed
1717
node_ver = (
1818
18,
1919
17,
2020
)
2121
wasmpack_ver = (0, 12, 1) # Latest tested wasm-pack version
22-
rust_fmt_ver = (1, 6, 0) # Current version when Rust 1.73 shipped
23-
clippy_ver = (0, 1, 69)
22+
rust_fmt_ver = (1, 7, 0) # Current version when Rust 1.75 shipped
23+
clippy_ver = (0, 1, 75)
2424

2525
# Disable buffered output so that the log statements and subprocess output get interleaved in proper order
2626
print = functools.partial(print, flush=True)

0 commit comments

Comments
 (0)