Skip to content

Commit f4f34f6

Browse files
rust-timerrust-timer
committed
Revert to 1fa54ad 
1 parent 2bbfa02 commit f4f34f6

File tree

403 files changed

+3648
-8534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

403 files changed

+3648
-8534
lines changed

‎.github/workflows/ci.yml

+27-48
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ name: CI
2020
branches:
2121
- auto
2222
- try
23-
- try-perf
2423
- master
2524
pull_request:
2625
branches:
@@ -33,9 +32,9 @@ jobs:
3332
name: PR
3433
env:
3534
CI_JOB_NAME: "${{ matrix.name }}"
36-
SCCACHE_BUCKET: rust-lang-ci-sccache2
37-
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
38-
CACHE_DOMAIN: ci-caches.rust-lang.org
35+
SCCACHE_BUCKET: rust-lang-gha-caches
36+
TOOLSTATE_REPO: "https://github.com/pietroalbini/rust-toolstate"
37+
CACHE_DOMAIN: ci-caches-gha.rust-lang.org
3938
if: "github.event_name == 'pull_request'"
4039
strategy:
4140
matrix:
@@ -64,11 +63,6 @@ jobs:
6463
with:
6564
github_token: "${{ secrets.github_token }}"
6665
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
67-
- name: configure the PR in which the error message will be posted
68-
run: "echo \"[CI_PR_NUMBER=$num]\""
69-
env:
70-
num: "${{ github.event.number }}"
71-
if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
7266
- name: add extra environment variables
7367
run: src/ci/scripts/setup-environment.sh
7468
env:
@@ -139,15 +133,15 @@ jobs:
139133
name: try
140134
env:
141135
CI_JOB_NAME: "${{ matrix.name }}"
142-
SCCACHE_BUCKET: rust-lang-ci-sccache2
143-
DEPLOY_BUCKET: rust-lang-ci2
144-
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
145-
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/rust-lang/rust/issues"
136+
SCCACHE_BUCKET: rust-lang-gha-caches
137+
DEPLOY_BUCKET: rust-lang-gha
138+
TOOLSTATE_REPO: "https://github.com/pietroalbini/rust-toolstate"
139+
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/pietroalbini/rust-toolstate/issues"
146140
TOOLSTATE_PUBLISH: 1
147-
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
148-
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
149-
CACHE_DOMAIN: ci-caches.rust-lang.org
150-
if: "github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
141+
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZOMUQATD5
142+
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZH5AYXDVF
143+
CACHE_DOMAIN: ci-caches-gha.rust-lang.org
144+
if: "github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
151145
strategy:
152146
matrix:
153147
include:
@@ -168,11 +162,6 @@ jobs:
168162
with:
169163
github_token: "${{ secrets.github_token }}"
170164
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
171-
- name: configure the PR in which the error message will be posted
172-
run: "echo \"[CI_PR_NUMBER=$num]\""
173-
env:
174-
num: "${{ github.event.number }}"
175-
if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
176165
- name: add extra environment variables
177166
run: src/ci/scripts/setup-environment.sh
178167
env:
@@ -243,14 +232,14 @@ jobs:
243232
name: auto
244233
env:
245234
CI_JOB_NAME: "${{ matrix.name }}"
246-
SCCACHE_BUCKET: rust-lang-ci-sccache2
247-
DEPLOY_BUCKET: rust-lang-ci2
248-
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
249-
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/rust-lang/rust/issues"
235+
SCCACHE_BUCKET: rust-lang-gha-caches
236+
DEPLOY_BUCKET: rust-lang-gha
237+
TOOLSTATE_REPO: "https://github.com/pietroalbini/rust-toolstate"
238+
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/pietroalbini/rust-toolstate/issues"
250239
TOOLSTATE_PUBLISH: 1
251-
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
252-
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
253-
CACHE_DOMAIN: ci-caches.rust-lang.org
240+
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZOMUQATD5
241+
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZH5AYXDVF
242+
CACHE_DOMAIN: ci-caches-gha.rust-lang.org
254243
if: "github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'"
255244
strategy:
256245
matrix:
@@ -490,11 +479,6 @@ jobs:
490479
with:
491480
github_token: "${{ secrets.github_token }}"
492481
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
493-
- name: configure the PR in which the error message will be posted
494-
run: "echo \"[CI_PR_NUMBER=$num]\""
495-
env:
496-
num: "${{ github.event.number }}"
497-
if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
498482
- name: add extra environment variables
499483
run: src/ci/scripts/setup-environment.sh
500484
env:
@@ -620,11 +604,6 @@ jobs:
620604
with:
621605
github_token: "${{ secrets.github_token }}"
622606
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
623-
- name: configure the PR in which the error message will be posted
624-
run: "echo \"[CI_PR_NUMBER=$num]\""
625-
env:
626-
num: "${{ github.event.number }}"
627-
if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
628607
- name: add extra environment variables
629608
run: src/ci/scripts/setup-environment.sh
630609
env:
@@ -695,14 +674,14 @@ jobs:
695674
name: master
696675
runs-on: ubuntu-latest
697676
env:
698-
SCCACHE_BUCKET: rust-lang-ci-sccache2
699-
DEPLOY_BUCKET: rust-lang-ci2
700-
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
701-
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/rust-lang/rust/issues"
677+
SCCACHE_BUCKET: rust-lang-gha-caches
678+
DEPLOY_BUCKET: rust-lang-gha
679+
TOOLSTATE_REPO: "https://github.com/pietroalbini/rust-toolstate"
680+
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/pietroalbini/rust-toolstate/issues"
702681
TOOLSTATE_PUBLISH: 1
703-
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
704-
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
705-
CACHE_DOMAIN: ci-caches.rust-lang.org
682+
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZOMUQATD5
683+
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZH5AYXDVF
684+
CACHE_DOMAIN: ci-caches-gha.rust-lang.org
706685
if: "github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'rust-lang-ci/rust'"
707686
steps:
708687
- name: checkout the source code
@@ -718,7 +697,7 @@ jobs:
718697
try-success:
719698
needs:
720699
- try
721-
if: "success() && github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
700+
if: "success() && github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
722701
steps:
723702
- name: mark the job as a success
724703
run: exit 0
@@ -728,7 +707,7 @@ jobs:
728707
try-failure:
729708
needs:
730709
- try
731-
if: "!success() && github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
710+
if: "!success() && github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
732711
steps:
733712
- name: mark the job as a failure
734713
run: exit 1

‎Cargo.lock

+4-11
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,9 @@ version = "0.1.0"
412412

413413
[[package]]
414414
name = "cc"
415-
version = "1.0.58"
415+
version = "1.0.57"
416416
source = "registry+https://github.com/rust-lang/crates.io-index"
417-
checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518"
417+
checksum = "0fde55d2a2bfaa4c9668bbc63f531fbdeee3ffe188f4662511ce2c22b3eedebe"
418418
dependencies = [
419419
"jobserver",
420420
]
@@ -1576,9 +1576,9 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
15761576

15771577
[[package]]
15781578
name = "libc"
1579-
version = "0.2.73"
1579+
version = "0.2.71"
15801580
source = "registry+https://github.com/rust-lang/crates.io-index"
1581-
checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9"
1581+
checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
15821582
dependencies = [
15831583
"rustc-std-workspace-core",
15841584
]
@@ -2821,13 +2821,6 @@ dependencies = [
28212821
"rls-span",
28222822
]
28232823

2824-
[[package]]
2825-
name = "rust-demangler"
2826-
version = "0.0.0"
2827-
dependencies = [
2828-
"rustc-demangle",
2829-
]
2830-
28312824
[[package]]
28322825
name = "rustbook"
28332826
version = "0.1.0"

‎Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ members = [
1717
"src/tools/remote-test-client",
1818
"src/tools/remote-test-server",
1919
"src/tools/rust-installer",
20-
"src/tools/rust-demangler",
2120
"src/tools/cargo",
2221
"src/tools/rustdoc",
2322
"src/tools/rls",

‎src/backtrace

‎src/bootstrap/builder.rs

+1-9
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,6 @@ impl<'a> Builder<'a> {
370370
tool::Cargo,
371371
tool::Rls,
372372
tool::RustAnalyzer,
373-
tool::RustDemangler,
374373
tool::Rustdoc,
375374
tool::Clippy,
376375
tool::CargoClippy,
@@ -1239,7 +1238,7 @@ impl<'a> Builder<'a> {
12391238
&& self.config.control_flow_guard
12401239
&& compiler.stage >= 1
12411240
{
1242-
rustflags.arg("-Ccontrol-flow-guard");
1241+
rustflags.arg("-Zcontrol-flow-guard");
12431242
}
12441243

12451244
// For `cargo doc` invocations, make rustdoc print the Rust version into the docs
@@ -1444,10 +1443,6 @@ pub struct Cargo {
14441443
}
14451444

14461445
impl Cargo {
1447-
pub fn rustdocflag(&mut self, arg: &str) -> &mut Cargo {
1448-
self.rustdocflags.arg(arg);
1449-
self
1450-
}
14511446
pub fn rustflag(&mut self, arg: &str) -> &mut Cargo {
14521447
self.rustflags.arg(arg);
14531448
self
@@ -1470,9 +1465,6 @@ impl Cargo {
14701465
}
14711466

14721467
pub fn env(&mut self, key: impl AsRef<OsStr>, value: impl AsRef<OsStr>) -> &mut Cargo {
1473-
// These are managed through rustflag/rustdocflag interfaces.
1474-
assert_ne!(key.as_ref(), "RUSTFLAGS");
1475-
assert_ne!(key.as_ref(), "RUSTDOCFLAGS");
14761468
self.command.env(key.as_ref(), value.as_ref());
14771469
self
14781470
}

0 commit comments

Comments
 (0)