Commit d7b5eb99 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1783782 - Update builders to rustc 1.63.0. r=firefox-build-system-reviewers,andi 

Differential Revision: https://phabricator.services.mozilla.com/D154177
parent b8562320

build/build-rust/rust-vendor-std.patch

+5 −5
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ For firefox's purposes, these patches still work fine, and are necessary 
to make -Zbuild-std work in a vendored environment.



diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs

index 6181a611ec3..8d99c148dcf 100644

index 6291b204e48..d4c90d29824 100644

--- a/src/bootstrap/dist.rs

+++ b/src/bootstrap/dist.rs

@@ -824,6 +824,30 @@ fn run(self, builder: &Builder<'_>) -> GeneratedTarball {

@@ -837,6 +837,30 @@ fn run(self, builder: &Builder<'_>) -> GeneratedTarball {

             builder.copy(&builder.src.join(file), &dst_src.join(file));

         }
@@ -47,10 +47,10 @@ index 6181a611ec3..8d99c148dcf 100644 
     }

 }

diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs

index a4e35bf6d47..cd5e478bed0 100644

index f84de73297a..d584444dfd2 100644

--- a/src/bootstrap/lib.rs

+++ b/src/bootstrap/lib.rs

@@ -1418,6 +1418,27 @@ fn tempdir(&self) -> PathBuf {

@@ -1416,6 +1416,27 @@ fn tempdir(&self) -> PathBuf {

         tmp

     }
@@ -77,4 +77,4 @@ index a4e35bf6d47..cd5e478bed0 100644 
+

     /// Copies a file from `src` to `dst`

     pub fn copy(&self, src: &Path, dst: &Path) {

         if self.config.dry_run {
 
         self.copy_internal(src, dst, false);

docs/writing-rust-code/update-policy.md

+2 −1
Original line number Diff line number Diff line
@@ -67,11 +67,12 @@ Here are the Rust versions for each Firefox version. 
| Firefox 101 | Rust 1.60.0 | 1.59.0 | 2022 April 7 | 2022 April 28 | 2022 May 31

| Firefox 102 | Rust 1.60.0 | 1.59.0 | 2022 April 7 | 2022 May 26 | 2022 June 28

| Firefox 103 | Rust 1.61.0 | 1.59.0 | 2022 May 19 | 2022 June 23 | 2022 July 27

| Firefox 104 | Rust 1.62.0 | 1.59.0 | 2022 June 30 | 2022 July 21 | 2022 August 23

| **Estimated** |

| Firefox 104 | Rust 1.62.0 | ? | 2022 June 30 | 2022 July 21 | 2022 August 23

| Firefox 105 | Rust 1.63.0 | ? | 2022 August 11 | 2022 August 18 | 2022 September 20

| Firefox 106 | Rust 1.63.0 | ? | 2022 August 11 | 2022 September 15 | 2022 October 18

| Firefox 107 | Rust 1.64.0 | ? | 2022 September 22 | 2022 October 13 | 2022 November 15

| Firefox 108 | Rust 1.65.0 | ? | 2022 November 3 | 2022 November 10 | 2022 December 13



New feature adoption schedule:

taskcluster/ci/fetch/toolchains.yml

+3 −3
Original line number Diff line number Diff line
@@ -365,13 +365,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.62.0:

    description: Rust 1.62.0 source code

rust-1.63.0:

    description: Rust 1.63.0 source code

    fetch:

        type: git

        include-dot-git: true

        repo: https://github.com/rust-lang/rust/

        revision: a8314ef7d0ec7b75c336af2c9857bfaf43002bfc

        revision: 4b91a6ea7258a947e59c6522cd5898e7c0a6a88f



wasi-sdk:

    description: wasi-sdk-16 source code

taskcluster/ci/toolchain/rust.yml

+20 −20
Original line number Diff line number Diff line
@@ -38,12 +38,12 @@ linux64-rust-1.61: 
        ]

        toolchain-alias: linux64-rust-toolchain



linux64-rust-1.62:

linux64-rust-1.63:

    treeherder:

        symbol: TL(rust)

    run:

        arguments: [

            '--channel', '1.62.0',

            '--channel', '1.63.0',

            '--host', 'x86_64-unknown-linux-gnu',

            '--target', 'x86_64-unknown-linux-gnu',

            '--target', 'i686-unknown-linux-gnu',
@@ -73,19 +73,19 @@ linux64-rust-dev: 
        ]

    fetches:

        fetch:

            - rust-1.62.0

            - rust-1.63.0

        toolchain:

            - linux64-clang-toolchain

            - linux64-binutils





linux64-rust-cross-1.62:

linux64-rust-cross-1.63:

    description: "rust repack with macos and windows cross support"

    treeherder:

        symbol: TL(rust-cross)

    run:

        arguments: [

            '--channel', '1.62.0',

            '--channel', '1.63.0',

            '--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.62: 
        ]

        toolchain-alias: linux64-rust-cross



linux64-rust-static-1.62:

linux64-rust-static-1.63:

    description: "rust repack with static linking support"

    treeherder:

        symbol: TL(rust-static)

    run:

        arguments: [

            '--channel', '1.62.0',

            '--channel', '1.63.0',

            '--host', 'x86_64-unknown-linux-gnu',

            '--target', 'x86_64-unknown-linux-gnu',

            '--target', 'x86_64-unknown-linux-musl',
@@ -131,13 +131,13 @@ linux64-rust-macos-1.61: 
        ]

        toolchain-alias: linux64-rust-macos-toolchain



linux64-rust-macos-1.62:

linux64-rust-macos-1.63:

    description: "rust repack with macos-cross support"

    treeherder:

        symbol: TL(rust-macos-1.62)

        symbol: TL(rust-macos)

    run:

        arguments: [

            '--channel', '1.62.0',

            '--channel', '1.63.0',

            '--host', 'x86_64-unknown-linux-gnu',

            '--target', 'x86_64-unknown-linux-gnu',

            '--target', 'x86_64-apple-darwin',
@@ -145,13 +145,13 @@ linux64-rust-macos-1.62: 
        ]

        toolchain-alias: linux64-rust-macos



linux64-rust-android-1.62:

linux64-rust-android-1.63:

    description: "rust repack with android-cross support"

    treeherder:

        symbol: TL(rust-android)

    run:

        arguments: [

            '--channel', '1.62.0',

            '--channel', '1.63.0',

            '--host', 'x86_64-unknown-linux-gnu',

            '--target', 'x86_64-unknown-linux-gnu',

            '--target', 'armv7-linux-androideabi',
@@ -180,13 +180,13 @@ linux64-rust-windows-1.61: 
        ]

        toolchain-alias: linux64-rust-windows-toolchain



linux64-rust-windows-1.62:

linux64-rust-windows-1.63:

    description: "rust repack with windows-cross support"

    treeherder:

        symbol: TL(rust-win)

    run:

        arguments: [

            '--channel', '1.62.0',

            '--channel', '1.63.0',

            '--host', 'x86_64-unknown-linux-gnu',

            '--target', 'x86_64-unknown-linux-gnu',

            '--target', 'x86_64-pc-windows-msvc',
@@ -207,12 +207,12 @@ win64-rust-1.61: 
        ]

        toolchain-alias: win64-rust-toolchain



win64-rust-1.62:

win64-rust-1.63:

    treeherder:

        symbol: TW64(rust)

    run:

        arguments: [

            '--channel', '1.62.0',

            '--channel', '1.63.0',

            '--host', 'x86_64-pc-windows-msvc',

            '--target', 'x86_64-pc-windows-msvc',

            '--target', 'i686-pc-windows-msvc',
@@ -220,23 +220,23 @@ win64-rust-1.62: 
        ]

        toolchain-alias: win64-rust



macosx64-rust-1.62:

macosx64-rust-1.63:

    treeherder:

        symbol: TM(rust)

    run:

        arguments: [

            '--channel', '1.62.0',

            '--channel', '1.63.0',

            '--host', 'x86_64-apple-darwin',

            '--target', 'x86_64-apple-darwin',

        ]

        toolchain-alias: macosx64-rust



mingw32-rust-1.62:

mingw32-rust-1.63:

    treeherder:

        symbol: TMW(rust)

    run:

        arguments: [

            '--channel', '1.62.0',

            '--channel', '1.63.0',

            '--host', 'x86_64-unknown-linux-gnu',

            '--target', 'i686-unknown-linux-gnu',

            '--target', 'i686-pc-windows-gnu',