Skip to content

Commit e8b55a4

Browse files
committed
Auto merge of #74662 - Manishearth:rollup-jdt7t71, r=Manishearth
Rollup of 9 pull requests Successful merges: - #73783 (Detect when `'static` obligation might come from an `impl`) - #73868 (Advertise correct stable version for const control flow) - #74460 (rustdoc: Always warn when linking from public to private items) - #74538 (Guard against non-monomorphized type_id intrinsic call) - #74541 (Add the aarch64-apple-darwin target ) - #74600 (Enable perf try builder) - #74618 (Do not ICE on assoc type with bad placeholder) - #74631 (rustc_target: Add a target spec option for disabling `--eh-frame-hdr`) - #74643 (build: Remove unnecessary `cargo:rerun-if-env-changed` annotations) Failed merges: r? @ghost
2 parents 4a86573 + b32383c commit e8b55a4

File tree

115 files changed

+1582
-562
lines changed

Some content is hidden

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

115 files changed

+1582
-562
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ name: CI
2020
branches:
2121
- auto
2222
- try
23+
- try-perf
2324
- master
2425
pull_request:
2526
branches:
@@ -146,7 +147,7 @@ jobs:
146147
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
147148
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
148149
CACHE_DOMAIN: ci-caches.rust-lang.org
149-
if: "github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
150+
if: "github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
150151
strategy:
151152
matrix:
152153
include:
@@ -717,7 +718,7 @@ jobs:
717718
try-success:
718719
needs:
719720
- try
720-
if: "success() && github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
721+
if: "success() && github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
721722
steps:
722723
- name: mark the job as a success
723724
run: exit 0
@@ -727,7 +728,7 @@ jobs:
727728
try-failure:
728729
needs:
729730
- try
730-
if: "!success() && github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
731+
if: "!success() && github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
731732
steps:
732733
- name: mark the job as a failure
733734
run: exit 1

Cargo.lock

Lines changed: 4 additions & 4 deletions
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.57"
415+
version = "1.0.58"
416416
source = "registry+https://github.com/rust-lang/crates.io-index"
417-
checksum = "0fde55d2a2bfaa4c9668bbc63f531fbdeee3ffe188f4662511ce2c22b3eedebe"
417+
checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518"
418418
dependencies = [
419419
"jobserver",
420420
]
@@ -1576,9 +1576,9 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
15761576

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

src/build_helper/lib.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
use std::ffi::{OsStr, OsString};
2+
use std::fmt::Display;
13
use std::path::{Path, PathBuf};
24
use std::process::{Command, Stdio};
35
use std::time::{SystemTime, UNIX_EPOCH};
@@ -28,6 +30,14 @@ macro_rules! t {
2830
};
2931
}
3032

33+
/// Reads an environment variable and adds it to dependencies.
34+
/// Supposed to be used for all variables except those set for build scripts by cargo
35+
/// https://doc.rust-lang.org/cargo/reference/environment-variables.html#environment-variables-cargo-sets-for-build-scripts
36+
pub fn tracked_env_var_os<K: AsRef<OsStr> + Display>(key: K) -> Option<OsString> {
37+
println!("cargo:rerun-if-env-changed={}", key);
38+
env::var_os(key)
39+
}
40+
3141
// Because Cargo adds the compiler's dylib path to our library search path, llvm-config may
3242
// break: the dylib path for the compiler, as of this writing, contains a copy of the LLVM
3343
// shared library, which means that when our freshly built llvm-config goes to load it's
@@ -37,10 +47,8 @@ macro_rules! t {
3747
// perfect -- we might actually want to see something from Cargo's added library paths -- but
3848
// for now it works.
3949
pub fn restore_library_path() {
40-
println!("cargo:rerun-if-env-changed=REAL_LIBRARY_PATH_VAR");
41-
println!("cargo:rerun-if-env-changed=REAL_LIBRARY_PATH");
42-
let key = env::var_os("REAL_LIBRARY_PATH_VAR").expect("REAL_LIBRARY_PATH_VAR");
43-
if let Some(env) = env::var_os("REAL_LIBRARY_PATH") {
50+
let key = tracked_env_var_os("REAL_LIBRARY_PATH_VAR").expect("REAL_LIBRARY_PATH_VAR");
51+
if let Some(env) = tracked_env_var_os("REAL_LIBRARY_PATH") {
4452
env::set_var(&key, &env);
4553
} else {
4654
env::remove_var(&key);

src/ci/github-actions/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ on:
247247
branches:
248248
- auto
249249
- try
250+
- try-perf
250251
- master
251252
pull_request:
252253
branches:
@@ -285,7 +286,7 @@ jobs:
285286
name: try
286287
env:
287288
<<: [*shared-ci-variables, *prod-variables]
288-
if: github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'
289+
if: github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'
289290
strategy:
290291
matrix:
291292
include:
@@ -645,11 +646,11 @@ jobs:
645646
# successful listening to webhooks only.
646647
try-success:
647648
needs: [try]
648-
if: "success() && github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
649+
if: "success() && github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
649650
<<: *base-success-job
650651
try-failure:
651652
needs: [try]
652-
if: "!success() && github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
653+
if: "!success() && github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
653654
<<: *base-failure-job
654655
auto-success:
655656
needs: [auto]

src/libprofiler_builtins/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[package]
22
authors = ["The Rust Project Developers"]
3-
build = "build.rs"
43
name = "profiler_builtins"
54
version = "0.0.0"
65
edition = "2018"

src/libprofiler_builtins/build.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ fn main() {
99
let target = env::var("TARGET").expect("TARGET was not set");
1010
let cfg = &mut cc::Build::new();
1111

12+
// FIXME: `rerun-if-changed` directives are not currently emitted and the build script
13+
// will not rerun on changes in these source files or headers included into them.
1214
let mut profile_sources = vec![
1315
"GCDAProfiling.c",
1416
"InstrProfiling.c",

src/librustc_ast/build.rs

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/librustc_attr/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ authors = ["The Rust Project Developers"]
33
name = "rustc_attr"
44
version = "0.0.0"
55
edition = "2018"
6-
build = "build.rs"
76

87
[lib]
98
name = "rustc_attr"

src/librustc_attr/build.rs

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/librustc_codegen_llvm/build.rs

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)