Skip to content

Commit

Permalink
upgrade Rust to v1.68.0 (pantsbuild#18480)
Browse files Browse the repository at this point in the history
Upgrade Rust to [v1.68.0](https://blog.rust-lang.org/2023/03/09/Rust-1.68.0.html).

A major change in this release is [the stabilization of the Cargo spare index protocol](https://blog.rust-lang.org/2023/03/09/Rust-1.68.0.html#cargos-sparse-protocol). In a future PR, we should be able to enable this to speed up any downloads of the crate index.
  • Loading branch information
tdyas authored Mar 12, 2023
1 parent 0b6933c commit ae1a896
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test-cron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: actions/cache@v3
with:
key: Linux-ARM64-rustup-${{ hashFiles('rust-toolchain') }}-v2
path: '~/.rustup/toolchains/1.67.1-*
path: '~/.rustup/toolchains/1.68.0-*
~/.rustup/update-hashes
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
uses: actions/cache@v3
with:
key: Linux-x86_64-rustup-${{ hashFiles('rust-toolchain') }}-v2
path: '~/.rustup/toolchains/1.67.1-*
path: '~/.rustup/toolchains/1.68.0-*
~/.rustup/update-hashes
Expand Down Expand Up @@ -247,7 +247,7 @@ jobs:
uses: actions/cache@v3
with:
key: macOS11-x86_64-rustup-${{ hashFiles('rust-toolchain') }}-v2
path: '~/.rustup/toolchains/1.67.1-*
path: '~/.rustup/toolchains/1.68.0-*
~/.rustup/update-hashes
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
uses: actions/cache@v3
with:
key: Linux-ARM64-rustup-${{ hashFiles('rust-toolchain') }}-v2
path: '~/.rustup/toolchains/1.67.1-*
path: '~/.rustup/toolchains/1.68.0-*
~/.rustup/update-hashes
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
uses: actions/cache@v3
with:
key: Linux-x86_64-rustup-${{ hashFiles('rust-toolchain') }}-v2
path: '~/.rustup/toolchains/1.67.1-*
path: '~/.rustup/toolchains/1.68.0-*
~/.rustup/update-hashes
Expand Down Expand Up @@ -249,7 +249,7 @@ jobs:
uses: actions/cache@v3
with:
key: macOS11-x86_64-rustup-${{ hashFiles('rust-toolchain') }}-v2
path: '~/.rustup/toolchains/1.67.1-*
path: '~/.rustup/toolchains/1.68.0-*
~/.rustup/update-hashes
Expand Down Expand Up @@ -474,7 +474,7 @@ jobs:
uses: actions/cache@v3
with:
key: macOS10-15-x86_64-rustup-${{ hashFiles('rust-toolchain') }}-v2
path: '~/.rustup/toolchains/1.67.1-*
path: '~/.rustup/toolchains/1.68.0-*
~/.rustup/update-hashes
Expand Down Expand Up @@ -542,7 +542,7 @@ jobs:
uses: actions/cache@v3
with:
key: macOS11-ARM64-rustup-${{ hashFiles('rust-toolchain') }}-v2
path: '~/.rustup/toolchains/1.67.1-*
path: '~/.rustup/toolchains/1.68.0-*
~/.rustup/update-hashes
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "1.67.1"
channel = "1.68.0"
components = [
"cargo",
"clippy",
Expand Down
2 changes: 1 addition & 1 deletion src/rust/engine/src/scheduler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ impl Scheduler {
let mut entry = sizes.entry(k.workunit_name()).or_insert_with(|| (0, 0));
entry.0 += 1;
entry.1 += {
std::mem::size_of_val(&k)
std::mem::size_of_val(k)
+ k.deep_size_of_children(&mut deep_context)
+ std::mem::size_of_val(&v)
+ v.deep_size_of_children(&mut deep_context)
Expand Down

0 comments on commit ae1a896

Please sign in to comment.