diff --git a/.github/workflows/test-cron.yaml b/.github/workflows/test-cron.yaml index 845a09625d4..11f1f972090 100644 --- a/.github/workflows/test-cron.yaml +++ b/.github/workflows/test-cron.yaml @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1211befe84a..b0b61186dbd 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/rust-toolchain b/rust-toolchain index 26a190cdc1c..699246cfa8b 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,5 +1,5 @@ [toolchain] -channel = "1.67.1" +channel = "1.68.0" components = [ "cargo", "clippy", diff --git a/src/rust/engine/src/scheduler.rs b/src/rust/engine/src/scheduler.rs index f5bcf77f87b..1c01758b7e7 100644 --- a/src/rust/engine/src/scheduler.rs +++ b/src/rust/engine/src/scheduler.rs @@ -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)