diff options
| author | bors <bors@rust-lang.org> | 2022-02-07 12:38:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-02-07 12:38:21 +0000 |
| commit | c5e414843ebfe25674d8e18a5369d6249fdee741 (patch) | |
| tree | f4c540d818de850b93d2f2d45ca8400014e7a898 | |
| parent | 926e7843eaa1794f15948395588eddedfb74a0d8 (diff) | |
| parent | d91e7a3663854f97a7ccb8a175555d49942f90ba (diff) | |
Auto merge of #93719 - scottmcm:core-as-2021-everywhere, r=Mark-Simulacrum
Build libcore as 2021 in a few more places The `Cargo.toml` has `edition = "2021"` (as of #92068), so that's what these command lines should use too.
| -rw-r--r-- | library/core/Cargo.toml | 2 | ||||
| -rwxr-xr-x | src/ci/pgo.sh | 16 | ||||
| -rw-r--r-- | src/test/run-make-fulldeps/core-no-fp-fmt-parse/Makefile | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/library/core/Cargo.toml b/library/core/Cargo.toml index 6bc4ba3cc0e..6a0c6cd961d 100644 --- a/library/core/Cargo.toml +++ b/library/core/Cargo.toml @@ -6,6 +6,8 @@ repository = "https://github.com/rust-lang/rust.git" description = "The Rust Core Library" autotests = false autobenches = false +# If you update this, be sure to update it in a bunch of other places too! +# As of 2022, it was the ci/pgo.sh script and the core-no-fp-fmt-parse test. edition = "2021" [lib] diff --git a/src/ci/pgo.sh b/src/ci/pgo.sh index 29ef13a60fb..eaf92b033a1 100755 --- a/src/ci/pgo.sh +++ b/src/ci/pgo.sh @@ -14,10 +14,10 @@ python3 ../x.py build --target=$PGO_HOST --host=$PGO_HOST \ --llvm-profile-generate # Profile libcore compilation in opt-level=0 and opt-level=3 -RUSTC_BOOTSTRAP=1 ./build/$PGO_HOST/stage2/bin/rustc --edition=2018 \ - --crate-type=lib ../library/core/src/lib.rs -RUSTC_BOOTSTRAP=1 ./build/$PGO_HOST/stage2/bin/rustc --edition=2018 \ - --crate-type=lib -Copt-level=3 ../library/core/src/lib.rs +RUSTC_BOOTSTRAP=1 ./build/$PGO_HOST/stage2/bin/rustc \ + --edition=2021 --crate-type=lib ../library/core/src/lib.rs +RUSTC_BOOTSTRAP=1 ./build/$PGO_HOST/stage2/bin/rustc \ + --edition=2021 --crate-type=lib -Copt-level=3 ../library/core/src/lib.rs # Merge the profile data we gathered for LLVM # Note that this uses the profdata from the clang we used to build LLVM, @@ -37,10 +37,10 @@ python3 ../x.py build --target=$PGO_HOST --host=$PGO_HOST \ --rust-profile-generate=/tmp/rustc-pgo # Profile libcore compilation in opt-level=0 and opt-level=3 -RUSTC_BOOTSTRAP=1 ./build/$PGO_HOST/stage2/bin/rustc --edition=2018 \ - --crate-type=lib ../library/core/src/lib.rs -RUSTC_BOOTSTRAP=1 ./build/$PGO_HOST/stage2/bin/rustc --edition=2018 \ - --crate-type=lib -Copt-level=3 ../library/core/src/lib.rs +RUSTC_BOOTSTRAP=1 ./build/$PGO_HOST/stage2/bin/rustc \ + --edition=2021 --crate-type=lib ../library/core/src/lib.rs +RUSTC_BOOTSTRAP=1 ./build/$PGO_HOST/stage2/bin/rustc \ + --edition=2021 --crate-type=lib -Copt-level=3 ../library/core/src/lib.rs cp -r /tmp/rustc-perf ./ chown -R $(whoami): ./rustc-perf diff --git a/src/test/run-make-fulldeps/core-no-fp-fmt-parse/Makefile b/src/test/run-make-fulldeps/core-no-fp-fmt-parse/Makefile index bc4562bef3a..f79e4c3f479 100644 --- a/src/test/run-make-fulldeps/core-no-fp-fmt-parse/Makefile +++ b/src/test/run-make-fulldeps/core-no-fp-fmt-parse/Makefile @@ -1,4 +1,4 @@ -include ../tools.mk all: - $(RUSTC) --edition=2018 --crate-type=rlib ../../../../library/core/src/lib.rs --cfg no_fp_fmt_parse + $(RUSTC) --edition=2021 --crate-type=rlib ../../../../library/core/src/lib.rs --cfg no_fp_fmt_parse |