diff --git a/docs/writing-rust-code/update-policy.md b/docs/writing-rust-code/update-policy.md index 43a91d67a49e..27d575a36e36 100644 --- a/docs/writing-rust-code/update-policy.md +++ b/docs/writing-rust-code/update-policy.md @@ -141,8 +141,8 @@ Here are the Rust versions for each Firefox version. | Firefox 112 | Rust 1.67.0 | 1.65.0 | 2023 January 26 | 2023 March 9 | 2023 April 11 | 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 | **Estimated** | +| Firefox 115 | Rust 1.69.0 | 1.66.0 | 2023 April 20 | 2023 June 1 | 2023 July 4 | Firefox 116 | Rust 1.70.0 | ? | 2023 June 1 | 2023 June 29 | 2023 August 1 | 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 diff --git a/js/src/build/moz.build b/js/src/build/moz.build index a19a65db6b24..4c48a5c4ffdf 100644 --- a/js/src/build/moz.build +++ b/js/src/build/moz.build @@ -82,7 +82,6 @@ if CONFIG["OS_ARCH"] == "SunOS": if CONFIG["OS_ARCH"] == "WINNT": OS_LIBS += [ "bcrypt", - "ntdll", ] if CONFIG["MOZ_NEEDS_LIBATOMIC"]: diff --git a/security/manager/ssl/builtins/dynamic-library/moz.build b/security/manager/ssl/builtins/dynamic-library/moz.build index 2413a4c441ad..7ba270194319 100644 --- a/security/manager/ssl/builtins/dynamic-library/moz.build +++ b/security/manager/ssl/builtins/dynamic-library/moz.build @@ -28,7 +28,6 @@ if CONFIG["OS_ARCH"] == "WINNT": ] OS_LIBS += [ "bcrypt", - "ntdll", ] diff --git a/security/manager/ssl/ipcclientcerts/dynamic-library/moz.build b/security/manager/ssl/ipcclientcerts/dynamic-library/moz.build index 7f2ab5e27fa2..12ae33de7bca 100644 --- a/security/manager/ssl/ipcclientcerts/dynamic-library/moz.build +++ b/security/manager/ssl/ipcclientcerts/dynamic-library/moz.build @@ -30,7 +30,6 @@ if CONFIG["OS_ARCH"] == "WINNT": ] OS_LIBS += [ "bcrypt", - "ntdll", ] diff --git a/security/manager/ssl/osclientcerts/dynamic-library/moz.build b/security/manager/ssl/osclientcerts/dynamic-library/moz.build index 36c0341ca7b6..f68e5c0d3991 100644 --- a/security/manager/ssl/osclientcerts/dynamic-library/moz.build +++ b/security/manager/ssl/osclientcerts/dynamic-library/moz.build @@ -18,7 +18,6 @@ if CONFIG["OS_ARCH"] == "WINNT": "ncrypt", "userenv", "ws2_32", - "ntdll", ] if CONFIG["OS_ARCH"] == "Darwin": diff --git a/taskcluster/ci/fetch/toolchains.yml b/taskcluster/ci/fetch/toolchains.yml index 24b4c75bae3c..cdda4e37d26f 100644 --- a/taskcluster/ci/fetch/toolchains.yml +++ b/taskcluster/ci/fetch/toolchains.yml @@ -364,13 +364,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.70.0: - description: Rust 1.70.0 source code +rust-1.69.0: + description: Rust 1.69.0 source code fetch: type: git include-dot-git: true repo: https://github.com/rust-lang/rust/ - revision: 90c541806f23a127002de5b4038be731ba1458ca + revision: 84c898d65adf2f39a5a98507f1fe0ce10a2b8dbc wasi-sdk: description: wasi-sdk-20 source code diff --git a/taskcluster/ci/toolchain/rust.yml b/taskcluster/ci/toolchain/rust.yml index 1f13bb28945c..0cb72a9cc714 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.70: +linux64-rust-1.69: treeherder: symbol: TL(rust) run: arguments: [ - '--channel', '1.70.0', + '--channel', '1.69.0', '--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.70.0 + - rust-1.69.0 toolchain: - linux64-clang-toolchain -linux64-rust-cross-1.70: +linux64-rust-cross-1.69: description: "rust repack with macos and windows cross support" treeherder: symbol: TL(rust-cross) run: arguments: [ - '--channel', '1.70.0', + '--channel', '1.69.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'i686-unknown-linux-gnu', @@ -124,13 +124,13 @@ linux64-rust-cross-beta: '--target', 'x86_64-linux-android', ] -linux64-rust-static-1.70: +linux64-rust-static-1.69: description: "rust repack with static linking support" treeherder: symbol: TL(rust-static) run: arguments: [ - '--channel', '1.70.0', + '--channel', '1.69.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'aarch64-unknown-linux-musl', '--target', 'x86_64-unknown-linux-gnu', @@ -154,13 +154,13 @@ linux64-rust-macos-1.65: ] toolchain-alias: linux64-rust-macos-toolchain -linux64-rust-macos-1.70: +linux64-rust-macos-1.69: description: "rust repack with macos-cross support" treeherder: symbol: TL(rust-macos) run: arguments: [ - '--channel', '1.70.0', + '--channel', '1.69.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-apple-darwin', @@ -168,13 +168,13 @@ linux64-rust-macos-1.70: ] toolchain-alias: linux64-rust-macos -linux64-rust-android-1.70: +linux64-rust-android-1.69: description: "rust repack with android-cross support" treeherder: symbol: TL(rust-android) run: arguments: [ - '--channel', '1.70.0', + '--channel', '1.69.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'armv7-linux-androideabi', @@ -199,13 +199,13 @@ linux64-rust-windows-1.65: ] toolchain-alias: linux64-rust-windows-toolchain -linux64-rust-windows-1.70: +linux64-rust-windows-1.69: description: "rust repack with windows-cross support" treeherder: symbol: TL(rust-win) run: arguments: [ - '--channel', '1.70.0', + '--channel', '1.69.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-pc-windows-msvc', @@ -214,12 +214,12 @@ linux64-rust-windows-1.70: ] toolchain-alias: linux64-rust-windows -win64-rust-1.70: +win64-rust-1.69: treeherder: symbol: TW64(rust) run: arguments: [ - '--channel', '1.70.0', + '--channel', '1.69.0', '--host', 'x86_64-pc-windows-msvc', '--target', 'x86_64-pc-windows-msvc', '--target', 'i686-pc-windows-msvc', @@ -227,23 +227,23 @@ win64-rust-1.70: ] toolchain-alias: win64-rust -macosx64-rust-1.70: +macosx64-rust-1.69: treeherder: symbol: TM(rust) run: arguments: [ - '--channel', '1.70.0', + '--channel', '1.69.0', '--host', 'x86_64-apple-darwin', '--target', 'x86_64-apple-darwin', ] toolchain-alias: macosx64-rust -mingw32-rust-1.70: +mingw32-rust-1.69: treeherder: symbol: TMW(rust) run: arguments: [ - '--channel', '1.70.0', + '--channel', '1.69.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'i686-unknown-linux-gnu', '--target', 'i686-pc-windows-gnu', diff --git a/toolkit/mozapps/defaultagent/moz.build b/toolkit/mozapps/defaultagent/moz.build index c675da6e99ab..c4fcfb9268f1 100644 --- a/toolkit/mozapps/defaultagent/moz.build +++ b/toolkit/mozapps/defaultagent/moz.build @@ -71,7 +71,6 @@ OS_LIBS += [ "userenv", "wininet", "ws2_32", - "ntdll", ] DEFINES["NS_NO_XPCOM"] = True