diff options
| author | bors <bors@rust-lang.org> | 2023-05-31 13:47:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-31 13:47:36 +0000 |
| commit | ad8304a0d5280de30856b39c19df7b306957e878 (patch) | |
| tree | 4c5167ddcf79cb528d67dcee35082adb7e38f980 /src | |
| parent | e4f7ad8e68206fa54372535b5c04d7ddbaea43be (diff) | |
| parent | 52bd82f522c4f3d9bd0dc534c06169285afbc23b (diff) | |
| download | rust-ad8304a0d5280de30856b39c19df7b306957e878.tar.gz rust-ad8304a0d5280de30856b39c19df7b306957e878.zip | |
Auto merge of #111076 - notriddle:notriddle/silence-private-dep-trait-impl-suggestions, r=cjgillot
diagnostics: exclude indirect private deps from trait impl suggest Fixes #88696
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/dist.rs | 3 | ||||
| -rw-r--r-- | src/bootstrap/metadata.rs | 3 | ||||
| -rw-r--r-- | src/bootstrap/test.rs | 3 | ||||
| -rwxr-xr-x | src/tools/rust-installer/combine-installers.sh | 4 | ||||
| -rwxr-xr-x | src/tools/rust-installer/gen-installer.sh | 4 | ||||
| -rwxr-xr-x | src/tools/rust-installer/make-tarballs.sh | 4 | ||||
| -rw-r--r-- | src/tools/tidy/src/main.rs | 6 |
7 files changed, 27 insertions, 0 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 46fc5b80e99..6a2409a0fbf 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1009,6 +1009,9 @@ impl Step for PlainSourceTarball { .arg(builder.src.join("./compiler/rustc_codegen_cranelift/Cargo.toml")) .arg("--sync") .arg(builder.src.join("./src/bootstrap/Cargo.toml")) + // Will read the libstd Cargo.toml + // which uses the unstable `public-dependency` feature. + .env("RUSTC_BOOTSTRAP", "1") .current_dir(&plain_dst_src); let config = if !builder.config.dry_run() { diff --git a/src/bootstrap/metadata.rs b/src/bootstrap/metadata.rs index 8f2c3faca3a..3b20ceac875 100644 --- a/src/bootstrap/metadata.rs +++ b/src/bootstrap/metadata.rs @@ -74,6 +74,9 @@ fn workspace_members(build: &Build) -> impl Iterator<Item = Package> { let collect_metadata = |manifest_path| { let mut cargo = Command::new(&build.initial_cargo); cargo + // Will read the libstd Cargo.toml + // which uses the unstable `public-dependency` feature. + .env("RUSTC_BOOTSTRAP", "1") .arg("metadata") .arg("--format-version") .arg("1") diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 3290e6e0309..6e573c2284e 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -2499,6 +2499,9 @@ impl Step for Distcheck { let toml = dir.join("rust-src/lib/rustlib/src/rust/library/std/Cargo.toml"); builder.run( Command::new(&builder.initial_cargo) + // Will read the libstd Cargo.toml + // which uses the unstable `public-dependency` feature. + .env("RUSTC_BOOTSTRAP", "1") .arg("generate-lockfile") .arg("--manifest-path") .arg(&toml) diff --git a/src/tools/rust-installer/combine-installers.sh b/src/tools/rust-installer/combine-installers.sh index bee5319fd55..01e5a00af4a 100755 --- a/src/tools/rust-installer/combine-installers.sh +++ b/src/tools/rust-installer/combine-installers.sh @@ -11,5 +11,9 @@ abs_path() { (unset CDPATH && cd "$path" > /dev/null && pwd) } +# Running cargo will read the libstd Cargo.toml +# which uses the unstable `public-dependency` feature. +export RUSTC_BOOTSTRAP=1 + src_dir="$(abs_path $(dirname "$0"))" $CARGO run --manifest-path="$src_dir/Cargo.toml" -- combine "$@" diff --git a/src/tools/rust-installer/gen-installer.sh b/src/tools/rust-installer/gen-installer.sh index eabd8c95cd8..cc45b5e0803 100755 --- a/src/tools/rust-installer/gen-installer.sh +++ b/src/tools/rust-installer/gen-installer.sh @@ -11,5 +11,9 @@ abs_path() { (unset CDPATH && cd "$path" > /dev/null && pwd) } +# Running cargo will read the libstd Cargo.toml +# which uses the unstable `public-dependency` feature. +export RUSTC_BOOTSTRAP=1 + src_dir="$(abs_path $(dirname "$0"))" $CARGO run --manifest-path="$src_dir/Cargo.toml" -- generate "$@" diff --git a/src/tools/rust-installer/make-tarballs.sh b/src/tools/rust-installer/make-tarballs.sh index e342007da37..374e103e89c 100755 --- a/src/tools/rust-installer/make-tarballs.sh +++ b/src/tools/rust-installer/make-tarballs.sh @@ -11,5 +11,9 @@ abs_path() { (unset CDPATH && cd "$path" > /dev/null && pwd) } +# Running cargo will read the libstd Cargo.toml +# which uses the unstable `public-dependency` feature. +export RUSTC_BOOTSTRAP=1 + src_dir="$(abs_path $(dirname "$0"))" $CARGO run --manifest-path="$src_dir/Cargo.toml" -- tarball "$@" diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs index 1c4d96c321c..e21068490b6 100644 --- a/src/tools/tidy/src/main.rs +++ b/src/tools/tidy/src/main.rs @@ -16,6 +16,12 @@ use std::sync::atomic::{AtomicBool, Ordering}; use std::thread::{self, scope, ScopedJoinHandle}; fn main() { + // Running Cargo will read the libstd Cargo.toml + // which uses the unstable `public-dependency` feature. + // + // `setenv` might not be thread safe, so run it before using multiple threads. + env::set_var("RUSTC_BOOTSTRAP", "1"); + let root_path: PathBuf = env::args_os().nth(1).expect("need path to root of repo").into(); let cargo: PathBuf = env::args_os().nth(2).expect("need path to cargo").into(); let output_directory: PathBuf = |
