From b58dadb609e255a69bc427974b4b6966213ed84c Mon Sep 17 00:00:00 2001 From: Natalia Csoregi Date: Fri, 6 Oct 2023 01:24:17 +0300 Subject: [PATCH] Backed out changeset 62f7af8fe549 (bug 1843981) for causing valgrind bustage. CLOSED TREE --- docs/writing-rust-code/update-policy.md | 16 +++-------- mozglue/static/rust/build.rs | 4 +-- taskcluster/ci/fetch/toolchains.yml | 6 ++-- taskcluster/ci/toolchain/rust.yml | 38 ++++++++++++------------- 4 files changed, 28 insertions(+), 36 deletions(-) diff --git a/docs/writing-rust-code/update-policy.md b/docs/writing-rust-code/update-policy.md index 3ff853054a79..d90fb5f42efa 100644 --- a/docs/writing-rust-code/update-policy.md +++ b/docs/writing-rust-code/update-policy.md @@ -142,17 +142,9 @@ Here are the Rust versions for each Firefox version. | Firefox 113 | Rust 1.68.0 | 1.65.0 | 2023 March 9 | 2023 April 6 | 2023 May 9 | Firefox 114 | Rust 1.69.0 | 1.65.0 | 2023 April 20 | 2023 May 4 | 2023 June 6 | Firefox 115 | Rust 1.69.0 | 1.66.0 | 2023 April 20 | 2023 June 1 | 2023 July 4 -| Firefox 116 | Rust 1.69.0 | 1.66.0 | 2023 April 20 | 2023 June 29 | 2023 August 1 -| Firefox 117 | Rust 1.71.0 | 1.66.0 | 2023 July 13 | 2023 July 27 | 2023 August 29 -| Firefox 118 | Rust 1.71.0 | 1.66.0 | 2023 July 13 | 2023 August 24 | 2023 September 26 -| Firefox 119 | Rust 1.72.0 | 1.66.0 | 2023 August 24 | 2023 September 21 | 2023 October 24 +| Firefox 116 | Rust 1.69.0 | 1.66.0 | 2023 June 1 | 2023 June 29 | 2023 August 1 | **Estimated** | +| Firefox 117 | Rust 1.71.0 | ? | 2023 July 13 | 2023 July 27 | 2023 August 29 +| Firefox 118 | Rust 1.71.0 | ? | 2023 July 13 | 2023 August 24 | 2023 September 26 +| Firefox 119 | Rust 1.72.0 | ? | 2023 August 24 | 2023 September 21 | 2023 October 24 | Firefox 120 | Rust 1.73.0 | ? | 2023 October 4 | 2023 October 19 | 2023 November 21 -| Firefox 121 | Rust 1.73.0 | ? | 2023 October 4 | 2023 November 16 | 2023 December 19 -| Firefox 122 | Rust 1.74.0 | ? | 2023 November 16 | 2023 December 14 | 2024 January 23 -| Firefox 123 | Rust 1.75.0 | ? | 2023 December 28 | 2024 January 11 | 2024 February 20 -| Firefox 124 | Rust 1.76.0 | ? | 2023 February 8 | 2024 February 15 | 2024 March 19 -| Firefox 125 | Rust 1.76.0 | ? | 2023 February 8 | 2024 March 14 | 2024 April 16 -| Firefox 126 | Rust 1.77.0 | ? | 2023 March 21 | 2024 April 19 | 2024 May 14 -| Firefox 127 | Rust 1.78.0 | ? | 2023 May 2 | 2024 May 9 | 2024 June 11 -| Firefox 128 | Rust 1.78.0 | ? | 2023 May 2 | 2024 June 6 | 2024 July 9 diff --git a/mozglue/static/rust/build.rs b/mozglue/static/rust/build.rs index cc7ca4d80e0c..120a50fee733 100644 --- a/mozglue/static/rust/build.rs +++ b/mozglue/static/rust/build.rs @@ -16,10 +16,10 @@ fn main() { println!("cargo:rerun-if-changed=wrappers.cpp"); let ver = version().unwrap(); - let max_oom_hook_version = Version::parse("1.74.0-alpha").unwrap(); + let max_oom_hook_version = Version::parse("1.73.0-alpha").unwrap(); // The new alloc error panic feature was temporarily reverted. We kept the // code in tree, but the version here is such that it's effectively never used. - let max_alloc_error_panic_version = Version::parse("1.74.0-alpha").unwrap(); + let max_alloc_error_panic_version = Version::parse("1.73.0-alpha").unwrap(); if ver < max_oom_hook_version { println!("cargo:rustc-cfg=feature=\"oom_with_hook\""); diff --git a/taskcluster/ci/fetch/toolchains.yml b/taskcluster/ci/fetch/toolchains.yml index 9fb4c1b2526c..ac296f535807 100644 --- a/taskcluster/ci/fetch/toolchains.yml +++ b/taskcluster/ci/fetch/toolchains.yml @@ -373,13 +373,13 @@ clang-trunk: # We build stable rust from source so the resulting compiler acts as a nightly # rust compiler, allowing to use unstable features like -Zbuild-std and # sanitizers. -rust-1.73.0: - description: Rust 1.73.0 source code +rust-1.72.1: + description: Rust 1.72.1 source code fetch: type: git include-dot-git: true repo: https://github.com/rust-lang/rust/ - revision: cc66ad468955717ab92600c770da8c1601a4ff33 + revision: d5c2e9c342b358556da91d61ed4133f6f50fc0c3 wasi-sdk-11: description: wasi-sdk-11 source code diff --git a/taskcluster/ci/toolchain/rust.yml b/taskcluster/ci/toolchain/rust.yml index a83fc67a42df..94ed35e9c7e5 100644 --- a/taskcluster/ci/toolchain/rust.yml +++ b/taskcluster/ci/toolchain/rust.yml @@ -39,12 +39,12 @@ linux64-rust-1.66: toolchain-alias: - linux64-rust-base -linux64-rust-1.73: +linux64-rust-1.72: treeherder: symbol: TL(rust) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.72.1', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'i686-unknown-linux-gnu', @@ -75,17 +75,17 @@ linux64-rust-dev: ] fetches: fetch: - - rust-1.73.0 + - rust-1.72.1 toolchain: - linux64-clang-toolchain -linux64-rust-cross-1.73: +linux64-rust-cross-1.72: description: "rust repack with macos and windows cross support" treeherder: symbol: TL(rust-cross) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.72.1', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'i686-unknown-linux-gnu', @@ -102,13 +102,13 @@ linux64-rust-cross-1.73: ] toolchain-alias: linux64-rust-cross -linux64-rust-static-1.73: +linux64-rust-static-1.72: description: "rust repack with static linking support" treeherder: symbol: TL(rust-static) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.72.1', '--host', 'x86_64-unknown-linux-gnu', '--target', 'aarch64-unknown-linux-musl', '--target', 'x86_64-unknown-linux-gnu', @@ -132,13 +132,13 @@ linux64-rust-macos-1.65: ] toolchain-alias: linux64-rust-macos-toolchain -linux64-rust-macos-1.73: +linux64-rust-macos-1.72: description: "rust repack with macos-cross support" treeherder: symbol: TL(rust-macos) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.72.1', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-apple-darwin', @@ -146,13 +146,13 @@ linux64-rust-macos-1.73: ] toolchain-alias: linux64-rust-macos -linux64-rust-android-1.73: +linux64-rust-android-1.72: description: "rust repack with android-cross support" treeherder: symbol: TL(rust-android) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.72.1', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'armv7-linux-androideabi', @@ -177,13 +177,13 @@ linux64-rust-windows-1.65: ] toolchain-alias: linux64-rust-windows-toolchain -linux64-rust-windows-1.73: +linux64-rust-windows-1.72: description: "rust repack with windows-cross support" treeherder: symbol: TL(rust-win) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.72.1', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-pc-windows-msvc', @@ -192,12 +192,12 @@ linux64-rust-windows-1.73: ] toolchain-alias: linux64-rust-windows -win64-rust-1.73: +win64-rust-1.72: treeherder: symbol: TW64(rust) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.72.1', '--host', 'x86_64-pc-windows-msvc', '--target', 'x86_64-pc-windows-msvc', '--target', 'i686-pc-windows-msvc', @@ -205,23 +205,23 @@ win64-rust-1.73: ] toolchain-alias: win64-rust -macosx64-rust-1.73: +macosx64-rust-1.72: treeherder: symbol: TM(rust) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.72.1', '--host', 'x86_64-apple-darwin', '--target', 'x86_64-apple-darwin', ] toolchain-alias: macosx64-rust -mingw32-rust-1.73: +mingw32-rust-1.72: treeherder: symbol: TMW(rust) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.72.1', '--host', 'x86_64-unknown-linux-gnu', '--target', 'i686-unknown-linux-gnu', '--target', 'i686-pc-windows-gnu',