Skip to content

Commit 669cfad

Browse files
rust-timerrust-timer
committed
Revert to 1fa54ad 
1 parent bbebe73 commit 669cfad

File tree

269 files changed

+2687
-6627
lines changed

Some content is hidden

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

269 files changed

+2687
-6627
lines changed

‎.github/workflows/ci.yml

+24-44
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ jobs:
3232
name: PR
3333
env:
3434
CI_JOB_NAME: "${{ matrix.name }}"
35-
SCCACHE_BUCKET: rust-lang-ci-sccache2
36-
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
37-
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
3838
if: "github.event_name == 'pull_request'"
3939
strategy:
4040
matrix:
@@ -63,11 +63,6 @@ jobs:
6363
with:
6464
github_token: "${{ secrets.github_token }}"
6565
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
66-
- name: configure the PR in which the error message will be posted
67-
run: "echo \"[CI_PR_NUMBER=$num]\""
68-
env:
69-
num: "${{ github.event.number }}"
70-
if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
7166
- name: add extra environment variables
7267
run: src/ci/scripts/setup-environment.sh
7368
env:
@@ -138,14 +133,14 @@ jobs:
138133
name: try
139134
env:
140135
CI_JOB_NAME: "${{ matrix.name }}"
141-
SCCACHE_BUCKET: rust-lang-ci-sccache2
142-
DEPLOY_BUCKET: rust-lang-ci2
143-
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
144-
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"
145140
TOOLSTATE_PUBLISH: 1
146-
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
147-
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
148-
CACHE_DOMAIN: ci-caches.rust-lang.org
141+
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZOMUQATD5
142+
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZH5AYXDVF
143+
CACHE_DOMAIN: ci-caches-gha.rust-lang.org
149144
if: "github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
150145
strategy:
151146
matrix:
@@ -167,11 +162,6 @@ jobs:
167162
with:
168163
github_token: "${{ secrets.github_token }}"
169164
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
170-
- name: configure the PR in which the error message will be posted
171-
run: "echo \"[CI_PR_NUMBER=$num]\""
172-
env:
173-
num: "${{ github.event.number }}"
174-
if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
175165
- name: add extra environment variables
176166
run: src/ci/scripts/setup-environment.sh
177167
env:
@@ -242,14 +232,14 @@ jobs:
242232
name: auto
243233
env:
244234
CI_JOB_NAME: "${{ matrix.name }}"
245-
SCCACHE_BUCKET: rust-lang-ci-sccache2
246-
DEPLOY_BUCKET: rust-lang-ci2
247-
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
248-
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"
249239
TOOLSTATE_PUBLISH: 1
250-
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
251-
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
252-
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
253243
if: "github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'"
254244
strategy:
255245
matrix:
@@ -489,11 +479,6 @@ jobs:
489479
with:
490480
github_token: "${{ secrets.github_token }}"
491481
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
492-
- name: configure the PR in which the error message will be posted
493-
run: "echo \"[CI_PR_NUMBER=$num]\""
494-
env:
495-
num: "${{ github.event.number }}"
496-
if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
497482
- name: add extra environment variables
498483
run: src/ci/scripts/setup-environment.sh
499484
env:
@@ -619,11 +604,6 @@ jobs:
619604
with:
620605
github_token: "${{ secrets.github_token }}"
621606
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
622-
- name: configure the PR in which the error message will be posted
623-
run: "echo \"[CI_PR_NUMBER=$num]\""
624-
env:
625-
num: "${{ github.event.number }}"
626-
if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
627607
- name: add extra environment variables
628608
run: src/ci/scripts/setup-environment.sh
629609
env:
@@ -694,14 +674,14 @@ jobs:
694674
name: master
695675
runs-on: ubuntu-latest
696676
env:
697-
SCCACHE_BUCKET: rust-lang-ci-sccache2
698-
DEPLOY_BUCKET: rust-lang-ci2
699-
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
700-
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"
701681
TOOLSTATE_PUBLISH: 1
702-
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
703-
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
704-
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
705685
if: "github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'rust-lang-ci/rust'"
706686
steps:
707687
- name: checkout the source code

‎Cargo.lock

-7
Original file line numberDiff line numberDiff line change
@@ -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)