From 38ded129236f112a7421f311aeb8ca750b661443 Mon Sep 17 00:00:00 2001
From: The 8472 <git@infinite-source.de>
Date: Thu, 18 Apr 2024 20:03:45 +0200
Subject: [PATCH 01/18] Abort a process when FD ownership is violated
When an EBADF happens then something else already touched an FD in ways it is not allowed to.
At that point things can already be arbitrarily bad, e.g. clobbered mmaps.
Recovery is not possible.
All we can do is hasten the fire.
---
library/std/src/os/fd/owned.rs | 15 ++++++++++++++-
library/std/src/sys/pal/unix/fs.rs | 21 +++++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/library/std/src/os/fd/owned.rs b/library/std/src/os/fd/owned.rs
index 010ce4e5076ba..8c421540af40e 100644
--- a/library/std/src/os/fd/owned.rs
+++ b/library/std/src/os/fd/owned.rs
@@ -176,7 +176,20 @@ impl Drop for OwnedFd {
// something like EINTR), we might close another valid file descriptor
// opened after we closed ours.
#[cfg(not(target_os = "hermit"))]
- let _ = libc::close(self.fd);
+ {
+ use crate::sys::os::errno;
+ // ideally this would use assert_unsafe_precondition!, but that's only in core
+ if cfg!(debug_assertions) {
+ // close() can bubble up error codes from FUSE which can send semantically
+ // inappropriate error codes including EBADF.
+ // So we check file flags instead which live on the file descriptor and not the underlying file.
+ // The downside is that it costs an extra syscall, so we only do it for debug.
+ if libc::fcntl(self.fd, libc::F_GETFD) == -1 && errno() == libc::EBADF {
+ rtabort!("IO Safety violation: owned file descriptor already closed");
+ }
+ }
+ let _ = libc::close(self.fd);
+ }
#[cfg(target_os = "hermit")]
let _ = hermit_abi::close(self.fd);
}
diff --git a/library/std/src/sys/pal/unix/fs.rs b/library/std/src/sys/pal/unix/fs.rs
index 3456155509ef3..2d57a9d81c911 100644
--- a/library/std/src/sys/pal/unix/fs.rs
+++ b/library/std/src/sys/pal/unix/fs.rs
@@ -870,6 +870,27 @@ impl Iterator for ReadDir {
impl Drop for Dir {
fn drop(&mut self) {
+ // ideally this would use assert_unsafe_precondition!, but that's only in core
+ #[cfg(all(
+ debug_assertions,
+ not(any(
+ target_os = "redox",
+ target_os = "nto",
+ target_os = "vita",
+ target_os = "hurd",
+ ))
+ ))]
+ {
+ use crate::sys::os::errno;
+ // close() can bubble up error codes from FUSE which can send semantically
+ // inappropriate error codes including EBADF.
+ // So we check file flags instead which live on the file descriptor and not the underlying file.
+ // The downside is that it costs an extra syscall, so we only do it for debug.
+ let fd = unsafe { libc::dirfd(self.0) };
+ if unsafe { libc::fcntl(fd, libc::F_GETFD) } == -1 && errno() == libc::EBADF {
+ rtabort!("IO Safety violation: DIR*'s owned file descriptor already closed");
+ }
+ }
let r = unsafe { libc::closedir(self.0) };
assert!(
r == 0 || crate::io::Error::last_os_error().is_interrupted(),
From 8088ea0ba026127786b23c516d1371d5e06eef30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Fri, 19 Apr 2024 18:02:21 +0200
Subject: [PATCH 02/18] add test for incremental ICE: slice-pattern-const.rs
#83085
Fixes #83085
---
.../slice-pattern-const-ice-83085.rs | 39 +++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 tests/incremental/slice-pattern-const-ice-83085.rs
diff --git a/tests/incremental/slice-pattern-const-ice-83085.rs b/tests/incremental/slice-pattern-const-ice-83085.rs
new file mode 100644
index 0000000000000..4d318fd7ec18a
--- /dev/null
+++ b/tests/incremental/slice-pattern-const-ice-83085.rs
@@ -0,0 +1,39 @@
+//@ compile-flags: -Zincremental-verify-ich=yes
+// issue: rust-lang/rust#83085 incremental ICE: forcing query with already existing `DepNode`
+// this used to fail to build straight away without needing any kind of
+// stage1/2 builds but tidy demands it
+//@ revisions:rpass1 rpass2
+
+fn main() {
+ const BOO: &[u8; 0] = &[];
+ match &[] {
+ BOO => (),
+ b"" => (),
+ _ => (),
+ }
+}
+
+#[derive(PartialEq, Eq)]
+struct Id<'a> {
+ ns: &'a str,
+}
+fn visit_struct() {
+ let id = Id { ns: "random1" };
+ const FLAG: Id<'static> = Id {
+ ns: "needs_to_be_the_same",
+ };
+ match id {
+ FLAG => {}
+ _ => {}
+ }
+}
+fn visit_struct2() {
+ let id = Id { ns: "random2" };
+ const FLAG: Id<'static> = Id {
+ ns: "needs_to_be_the_same",
+ };
+ match id {
+ FLAG => {}
+ _ => {}
+ }
+}
From a2fa934927a3d39860572f722bbe5f3cb691cf19 Mon Sep 17 00:00:00 2001
From: Jubilee Young <workingjubilee@gmail.com>
Date: Sun, 21 Apr 2024 13:21:36 -0700
Subject: [PATCH 03/18] bootstrap: Describe build_steps::test for 2024
The description was most accurate when it was still called rustbuild,
and I presume indeed did mostly run in CI. It has become something more
so try to describe it better for current-day usage.
---
src/bootstrap/src/core/build_steps/test.rs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
index 1980980b6d05c..867b359ccb133 100644
--- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -1,7 +1,7 @@
-//! Implementation of the test-related targets of the build system.
+//! Build-and-run steps for `./x.py test` test fixtures
//!
-//! This file implements the various regression test suites that we execute on
-//! our CI.
+//! `./x.py test` (aka [`Kind::Test`]) is currently allowed to reach build steps in other modules.
+//! However, this contains ~all test parts we expect people to be able to build and run locally.
use std::env;
use std::ffi::OsStr;
From 2042616134048f5226a97e405cb8357cde355e36 Mon Sep 17 00:00:00 2001
From: Jubilee Young <workingjubilee@gmail.com>
Date: Sun, 21 Apr 2024 13:32:46 -0700
Subject: [PATCH 04/18] bootstrap: Describe build_steps::run
---
src/bootstrap/src/core/build_steps/run.rs | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/bootstrap/src/core/build_steps/run.rs b/src/bootstrap/src/core/build_steps/run.rs
index 7028bffea5442..0a428ec5ca0a2 100644
--- a/src/bootstrap/src/core/build_steps/run.rs
+++ b/src/bootstrap/src/core/build_steps/run.rs
@@ -1,3 +1,8 @@
+//! Build-and-run steps for in-repo tools
+//!
+//! A bit of a hodge-podge as e.g. if a tool's a test fixture it should be in `build_steps::test`.
+//! If it can be reached from `./x.py run` it can go here.
+
use std::path::PathBuf;
use std::process::Command;
From 35ed725cd2c586b0aa5ebf3d2182c69e1cb0e392 Mon Sep 17 00:00:00 2001
From: Jubilee Young <workingjubilee@gmail.com>
Date: Sun, 21 Apr 2024 13:31:41 -0700
Subject: [PATCH 05/18] bootstrap: Describe build_steps::toolstate
---
src/bootstrap/src/core/build_steps/toolstate.rs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/bootstrap/src/core/build_steps/toolstate.rs b/src/bootstrap/src/core/build_steps/toolstate.rs
index deb782cad0ce4..6065aa1414fe1 100644
--- a/src/bootstrap/src/core/build_steps/toolstate.rs
+++ b/src/bootstrap/src/core/build_steps/toolstate.rs
@@ -1,3 +1,7 @@
+//! Toolstate checks to keep tools building
+//!
+//! Reachable via `./x.py test` but mostly relevant for CI, since it isn't run locally by default.
+
use crate::core::builder::{Builder, RunConfig, ShouldRun, Step};
use crate::utils::helpers::t;
use serde_derive::{Deserialize, Serialize};
From 8c40d0efa7881d49895398c8536c212c1e9e93cf Mon Sep 17 00:00:00 2001
From: Jubilee Young <workingjubilee@gmail.com>
Date: Sun, 21 Apr 2024 13:39:11 -0700
Subject: [PATCH 06/18] bootstrap: Describe build_steps::suggest
---
src/bootstrap/src/core/build_steps/suggest.rs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/bootstrap/src/core/build_steps/suggest.rs b/src/bootstrap/src/core/build_steps/suggest.rs
index c057fa9a5667b..754d1e61da8c6 100644
--- a/src/bootstrap/src/core/build_steps/suggest.rs
+++ b/src/bootstrap/src/core/build_steps/suggest.rs
@@ -1,3 +1,5 @@
+//! Attempt to magically identify good tests to run
+
#![cfg_attr(feature = "build-metrics", allow(unused))]
use clap::Parser;
From bc37f9e2040235a4e6b8bed6c6db4f064fea15cc Mon Sep 17 00:00:00 2001
From: Jubilee Young <workingjubilee@gmail.com>
Date: Sun, 21 Apr 2024 13:32:59 -0700
Subject: [PATCH 07/18] bootstrap: Describe build_steps::setup
---
src/bootstrap/src/core/build_steps/setup.rs | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/bootstrap/src/core/build_steps/setup.rs b/src/bootstrap/src/core/build_steps/setup.rs
index 7bc68b5aec11f..6b2b7e5dcaca2 100644
--- a/src/bootstrap/src/core/build_steps/setup.rs
+++ b/src/bootstrap/src/core/build_steps/setup.rs
@@ -1,3 +1,9 @@
+//! First time setup of a dev environment
+//!
+//! These are build-and-run steps for `./x.py setup`, which allows quickly setting up the directory
+//! for modifying, building, and running the compiler and library. The main convenience is to allow
+//! not having to painstakingly set every single option in config.toml.
+
use crate::core::builder::{Builder, RunConfig, ShouldRun, Step};
use crate::t;
use crate::utils::change_tracker::CONFIG_CHANGE_HISTORY;
From ce27ea935edd4cc04455e6abfdc8ba8ed86be451 Mon Sep 17 00:00:00 2001
From: Jubilee Young <workingjubilee@gmail.com>
Date: Sun, 21 Apr 2024 13:52:42 -0700
Subject: [PATCH 08/18] bootstrap: Demagic a repeating path
---
src/bootstrap/src/core/build_steps/setup.rs | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/bootstrap/src/core/build_steps/setup.rs b/src/bootstrap/src/core/build_steps/setup.rs
index 6b2b7e5dcaca2..a01d20e8c21ad 100644
--- a/src/bootstrap/src/core/build_steps/setup.rs
+++ b/src/bootstrap/src/core/build_steps/setup.rs
@@ -31,6 +31,8 @@ pub enum Profile {
None,
}
+static PROFILE_DIR: &str = "src/bootstrap/defaults";
+
/// A list of historical hashes of `src/etc/rust_analyzer_settings.json`.
/// New entries should be appended whenever this is updated so we can detect
/// outdated vs. user-modified settings files.
@@ -47,7 +49,7 @@ static RUST_ANALYZER_SETTINGS: &str = include_str!("../../../../etc/rust_analyze
impl Profile {
fn include_path(&self, src_path: &Path) -> PathBuf {
- PathBuf::from(format!("{}/src/bootstrap/defaults/config.{}.toml", src_path.display(), self))
+ PathBuf::from(format!("{}/{PROFILE_DIR}/config.{}.toml", src_path.display(), self))
}
pub fn all() -> impl Iterator<Item = Self> {
@@ -227,7 +229,7 @@ fn setup_config_toml(path: &PathBuf, profile: Profile, config: &Config) {
let latest_change_id = CONFIG_CHANGE_HISTORY.last().unwrap().change_id;
let settings = format!(
- "# Includes one of the default files in src/bootstrap/defaults\n\
+ "# Includes one of the default files in {PROFILE_DIR}\n\
profile = \"{profile}\"\n\
change-id = {latest_change_id}\n"
);
From b756b11ae399413ec728e3a01393a4eba00be2fc Mon Sep 17 00:00:00 2001
From: Jubilee Young <workingjubilee@gmail.com>
Date: Sun, 21 Apr 2024 18:39:48 -0700
Subject: [PATCH 09/18] bootstrap: Describe build_steps::clean how 2024 knows
it
---
src/bootstrap/src/core/build_steps/clean.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bootstrap/src/core/build_steps/clean.rs b/src/bootstrap/src/core/build_steps/clean.rs
index 9e103a350e654..10303f6af9e18 100644
--- a/src/bootstrap/src/core/build_steps/clean.rs
+++ b/src/bootstrap/src/core/build_steps/clean.rs
@@ -1,4 +1,4 @@
-//! Implementation of `make clean` in rustbuild.
+//! `./x.py clean`
//!
//! Responsible for cleaning out a build directory of all old and stale
//! artifacts to prepare for a fresh build. Currently doesn't remove the
From 67e3668c9a6db4ff33371b6c6daec34b7323d638 Mon Sep 17 00:00:00 2001
From: onur-ozkan <work@onurozkan.dev>
Date: Sun, 14 Apr 2024 23:07:00 +0300
Subject: [PATCH 10/18] introduce `x vendor`
Signed-off-by: onur-ozkan <work@onurozkan.dev>
---
src/bootstrap/src/core/build_steps/mod.rs | 1 +
src/bootstrap/src/core/build_steps/vendor.rs | 61 ++++++++++
src/bootstrap/src/core/builder.rs | 9 +-
src/bootstrap/src/core/config/config.rs | 6 +-
src/bootstrap/src/core/config/flags.rs | 24 ++++
src/etc/completions/x.py.fish | 37 ++++++
src/etc/completions/x.py.ps1 | 44 +++++++
src/etc/completions/x.py.sh | 119 ++++++++++++++++++-
src/etc/completions/x.py.zsh | 51 ++++++++
9 files changed, 347 insertions(+), 5 deletions(-)
create mode 100644 src/bootstrap/src/core/build_steps/vendor.rs
diff --git a/src/bootstrap/src/core/build_steps/mod.rs b/src/bootstrap/src/core/build_steps/mod.rs
index 9b7378165de41..381ee7ef53b4c 100644
--- a/src/bootstrap/src/core/build_steps/mod.rs
+++ b/src/bootstrap/src/core/build_steps/mod.rs
@@ -14,3 +14,4 @@ pub(crate) mod synthetic_targets;
pub(crate) mod test;
pub(crate) mod tool;
pub(crate) mod toolstate;
+pub(crate) mod vendor;
diff --git a/src/bootstrap/src/core/build_steps/vendor.rs b/src/bootstrap/src/core/build_steps/vendor.rs
new file mode 100644
index 0000000000000..68f1b1bef3f39
--- /dev/null
+++ b/src/bootstrap/src/core/build_steps/vendor.rs
@@ -0,0 +1,61 @@
+use crate::core::builder::{Builder, RunConfig, ShouldRun, Step};
+use std::path::PathBuf;
+use std::process::Command;
+
+#[derive(Debug, Clone, Hash, PartialEq, Eq)]
+pub(crate) struct Vendor {
+ sync_args: Vec<PathBuf>,
+ versioned_dirs: bool,
+ root_dir: PathBuf,
+}
+
+impl Step for Vendor {
+ type Output = ();
+ const DEFAULT: bool = true;
+ const ONLY_HOSTS: bool = true;
+
+ fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+ run.alias("placeholder").default_condition(true)
+ }
+
+ fn make_run(run: RunConfig<'_>) {
+ run.builder.ensure(Vendor {
+ sync_args: run.builder.config.cmd.vendor_sync_args(),
+ versioned_dirs: run.builder.config.cmd.vendor_versioned_dirs(),
+ root_dir: run.builder.src.clone(),
+ });
+ }
+
+ fn run(self, builder: &Builder<'_>) -> Self::Output {
+ let mut cmd = Command::new(&builder.initial_cargo);
+ cmd.arg("vendor");
+
+ if self.versioned_dirs {
+ cmd.arg("--versioned-dirs");
+ }
+
+ // Sync these paths by default.
+ for p in [
+ "src/tools/cargo/Cargo.toml",
+ "src/tools/rust-analyzer/Cargo.toml",
+ "compiler/rustc_codegen_cranelift/Cargo.toml",
+ "compiler/rustc_codegen_gcc/Cargo.toml",
+ "src/bootstrap/Cargo.toml",
+ ] {
+ cmd.arg("--sync").arg(builder.src.join(p));
+ }
+
+ // Also sync explicitly requested paths.
+ for sync_arg in self.sync_args {
+ cmd.arg("--sync").arg(sync_arg);
+ }
+
+ // Will read the libstd Cargo.toml
+ // which uses the unstable `public-dependency` feature.
+ cmd.env("RUSTC_BOOTSTRAP", "1");
+
+ cmd.current_dir(self.root_dir);
+
+ builder.run(&mut cmd);
+ }
+}
diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs
index adef9ebd0e306..09183d599fc17 100644
--- a/src/bootstrap/src/core/builder.rs
+++ b/src/bootstrap/src/core/builder.rs
@@ -14,8 +14,9 @@ use std::sync::OnceLock;
use std::time::{Duration, Instant};
use crate::core::build_steps::tool::{self, SourceType};
-use crate::core::build_steps::{check, clean, compile, dist, doc, install, run, setup, test};
-use crate::core::build_steps::{clippy, llvm};
+use crate::core::build_steps::{
+ check, clean, clippy, compile, dist, doc, install, llvm, run, setup, test, vendor,
+};
use crate::core::config::flags::{Color, Subcommand};
use crate::core::config::{DryRun, SplitDebuginfo, TargetSelection};
use crate::prepare_behaviour_dump_dir;
@@ -638,6 +639,7 @@ pub enum Kind {
Run,
Setup,
Suggest,
+ Vendor,
}
impl Kind {
@@ -658,6 +660,7 @@ impl Kind {
Kind::Run => "run",
Kind::Setup => "setup",
Kind::Suggest => "suggest",
+ Kind::Vendor => "vendor",
}
}
@@ -920,6 +923,7 @@ impl<'a> Builder<'a> {
),
Kind::Setup => describe!(setup::Profile, setup::Hook, setup::Link, setup::Vscode),
Kind::Clean => describe!(clean::CleanAll, clean::Rustc, clean::Std),
+ Kind::Vendor => describe!(vendor::Vendor),
// special-cased in Build::build()
Kind::Format | Kind::Suggest => vec![],
}
@@ -992,6 +996,7 @@ impl<'a> Builder<'a> {
Kind::Setup,
path.as_ref().map_or([].as_slice(), |path| std::slice::from_ref(path)),
),
+ Subcommand::Vendor { .. } => (Kind::Vendor, &paths[..]),
};
Self::new_internal(build, kind, paths.to_owned())
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index 2acce6273598c..687c806781853 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -2027,7 +2027,8 @@ impl Config {
| Subcommand::Run { .. }
| Subcommand::Setup { .. }
| Subcommand::Format { .. }
- | Subcommand::Suggest { .. } => flags.stage.unwrap_or(0),
+ | Subcommand::Suggest { .. }
+ | Subcommand::Vendor { .. } => flags.stage.unwrap_or(0),
};
// CI should always run stage 2 builds, unless it specifically states otherwise
@@ -2054,7 +2055,8 @@ impl Config {
| Subcommand::Run { .. }
| Subcommand::Setup { .. }
| Subcommand::Format { .. }
- | Subcommand::Suggest { .. } => {}
+ | Subcommand::Suggest { .. }
+ | Subcommand::Vendor { .. } => {}
}
}
diff --git a/src/bootstrap/src/core/config/flags.rs b/src/bootstrap/src/core/config/flags.rs
index aaa2a2c47e079..e3cc992bb5dee 100644
--- a/src/bootstrap/src/core/config/flags.rs
+++ b/src/bootstrap/src/core/config/flags.rs
@@ -456,6 +456,15 @@ Arguments:
#[arg(long)]
run: bool,
},
+ /// Vendor dependencies
+ Vendor {
+ /// Additional `Cargo.toml` to sync and vendor
+ #[arg(long)]
+ sync: Vec<PathBuf>,
+ /// Always include version in subdir name
+ #[arg(long)]
+ versioned_dirs: bool,
+ },
}
impl Subcommand {
@@ -476,6 +485,7 @@ impl Subcommand {
Subcommand::Run { .. } => Kind::Run,
Subcommand::Setup { .. } => Kind::Setup,
Subcommand::Suggest { .. } => Kind::Suggest,
+ Subcommand::Vendor { .. } => Kind::Vendor,
}
}
@@ -581,6 +591,20 @@ impl Subcommand {
_ => false,
}
}
+
+ pub fn vendor_versioned_dirs(&self) -> bool {
+ match *self {
+ Subcommand::Vendor { versioned_dirs, .. } => versioned_dirs,
+ _ => false,
+ }
+ }
+
+ pub fn vendor_sync_args(&self) -> Vec<PathBuf> {
+ match self {
+ Subcommand::Vendor { sync, .. } => sync.clone(),
+ _ => vec![],
+ }
+ }
}
/// Returns the shell completion for a given shell, if the result differs from the current
diff --git a/src/etc/completions/x.py.fish b/src/etc/completions/x.py.fish
index 5ae27bc8c91c5..40a25f13fcbdd 100644
--- a/src/etc/completions/x.py.fish
+++ b/src/etc/completions/x.py.fish
@@ -47,6 +47,7 @@ complete -c x.py -n "__fish_use_subcommand" -f -a "install" -d 'Install distribu
complete -c x.py -n "__fish_use_subcommand" -f -a "run" -d 'Run tools contained in this repository'
complete -c x.py -n "__fish_use_subcommand" -f -a "setup" -d 'Set up the environment for development'
complete -c x.py -n "__fish_use_subcommand" -f -a "suggest" -d 'Suggest a subset of tests to run, based on modified files'
+complete -c x.py -n "__fish_use_subcommand" -f -a "vendor" -d 'Vendor dependencies'
complete -c x.py -n "__fish_seen_subcommand_from build" -l config -d 'TOML configuration file for build' -r -F
complete -c x.py -n "__fish_seen_subcommand_from build" -l build-dir -d 'Build directory, overrides `build.build-dir` in `config.toml`' -r -f -a "(__fish_complete_directories)"
complete -c x.py -n "__fish_seen_subcommand_from build" -l build -d 'build target of the stage0 compiler' -r -f
@@ -590,3 +591,39 @@ complete -c x.py -n "__fish_seen_subcommand_from suggest" -l llvm-profile-genera
complete -c x.py -n "__fish_seen_subcommand_from suggest" -l enable-bolt-settings -d 'Enable BOLT link flags'
complete -c x.py -n "__fish_seen_subcommand_from suggest" -l skip-stage0-validation -d 'Skip stage0 compiler validation'
complete -c x.py -n "__fish_seen_subcommand_from suggest" -s h -l help -d 'Print help (see more with \'--help\')'
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l sync -d 'Additional `Cargo.toml` to sync and vendor' -r -F
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l config -d 'TOML configuration file for build' -r -F
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l build-dir -d 'Build directory, overrides `build.build-dir` in `config.toml`' -r -f -a "(__fish_complete_directories)"
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l build -d 'build target of the stage0 compiler' -r -f
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l host -d 'host targets to build' -r -f
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l target -d 'target targets to build' -r -f
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l exclude -d 'build paths to exclude' -r -F
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l skip -d 'build paths to skip' -r -F
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l rustc-error-format -r -f
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l on-fail -d 'command to run on failure' -r -f -a "(__fish_complete_command)"
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l stage -d 'stage to build (indicates compiler to use/test, e.g., stage 0 uses the bootstrap compiler, stage 1 the stage 0 rustc artifacts, etc.)' -r -f
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l keep-stage -d 'stage(s) to keep without recompiling (pass multiple times to keep e.g., both stages 0 and 1)' -r -f
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l keep-stage-std -d 'stage(s) of the standard library to keep without recompiling (pass multiple times to keep e.g., both stages 0 and 1)' -r -f
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l src -d 'path to the root of the rust checkout' -r -f -a "(__fish_complete_directories)"
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -s j -l jobs -d 'number of jobs to run in parallel' -r -f
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l warnings -d 'if value is deny, will deny warnings if value is warn, will emit warnings otherwise, use the default configured behaviour' -r -f -a "{deny '',warn '',default ''}"
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l error-format -d 'rustc error format' -r -f
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l color -d 'whether to use color in cargo and rustc output' -r -f -a "{always '',never '',auto ''}"
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l llvm-skip-rebuild -d 'whether rebuilding llvm should be skipped, overriding `skip-rebuld` in config.toml' -r -f -a "{true '',false ''}"
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l rust-profile-generate -d 'generate PGO profile with rustc build' -r -F
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l rust-profile-use -d 'use PGO profile for rustc build' -r -F
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l llvm-profile-use -d 'use PGO profile for LLVM build' -r -F
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l reproducible-artifact -d 'Additional reproducible artifacts that should be added to the reproducible artifacts archive' -r
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l set -d 'override options in config.toml' -r -f
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l versioned-dirs -d 'Always include version in subdir name'
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -s v -l verbose -d 'use verbose output (-vv for very verbose)'
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -s i -l incremental -d 'use incremental compilation'
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l include-default-paths -d 'include default paths in addition to the provided ones'
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l dry-run -d 'dry run; don\'t build anything'
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l dump-bootstrap-shims -d 'Indicates whether to dump the work done from bootstrap shims'
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l json-output -d 'use message-format=json'
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l bypass-bootstrap-lock -d 'Bootstrap uses this value to decide whether it should bypass locking the build process. This is rarely needed (e.g., compiling the std library for different targets in parallel)'
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l llvm-profile-generate -d 'generate PGO profile with llvm built for rustc'
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l enable-bolt-settings -d 'Enable BOLT link flags'
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -l skip-stage0-validation -d 'Skip stage0 compiler validation'
+complete -c x.py -n "__fish_seen_subcommand_from vendor" -s h -l help -d 'Print help (see more with \'--help\')'
diff --git a/src/etc/completions/x.py.ps1 b/src/etc/completions/x.py.ps1
index d39639a1f91d8..f3d1d372c7337 100644
--- a/src/etc/completions/x.py.ps1
+++ b/src/etc/completions/x.py.ps1
@@ -74,6 +74,7 @@ Register-ArgumentCompleter -Native -CommandName 'x.py' -ScriptBlock {
[CompletionResult]::new('run', 'run', [CompletionResultType]::ParameterValue, 'Run tools contained in this repository')
[CompletionResult]::new('setup', 'setup', [CompletionResultType]::ParameterValue, 'Set up the environment for development')
[CompletionResult]::new('suggest', 'suggest', [CompletionResultType]::ParameterValue, 'Suggest a subset of tests to run, based on modified files')
+ [CompletionResult]::new('vendor', 'vendor', [CompletionResultType]::ParameterValue, 'Vendor dependencies')
break
}
'x.py;build' {
@@ -724,6 +725,49 @@ Register-ArgumentCompleter -Native -CommandName 'x.py' -ScriptBlock {
[CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
break
}
+ 'x.py;vendor' {
+ [CompletionResult]::new('--sync', 'sync', [CompletionResultType]::ParameterName, 'Additional `Cargo.toml` to sync and vendor')
+ [CompletionResult]::new('--config', 'config', [CompletionResultType]::ParameterName, 'TOML configuration file for build')
+ [CompletionResult]::new('--build-dir', 'build-dir', [CompletionResultType]::ParameterName, 'Build directory, overrides `build.build-dir` in `config.toml`')
+ [CompletionResult]::new('--build', 'build', [CompletionResultType]::ParameterName, 'build target of the stage0 compiler')
+ [CompletionResult]::new('--host', 'host', [CompletionResultType]::ParameterName, 'host targets to build')
+ [CompletionResult]::new('--target', 'target', [CompletionResultType]::ParameterName, 'target targets to build')
+ [CompletionResult]::new('--exclude', 'exclude', [CompletionResultType]::ParameterName, 'build paths to exclude')
+ [CompletionResult]::new('--skip', 'skip', [CompletionResultType]::ParameterName, 'build paths to skip')
+ [CompletionResult]::new('--rustc-error-format', 'rustc-error-format', [CompletionResultType]::ParameterName, 'rustc-error-format')
+ [CompletionResult]::new('--on-fail', 'on-fail', [CompletionResultType]::ParameterName, 'command to run on failure')
+ [CompletionResult]::new('--stage', 'stage', [CompletionResultType]::ParameterName, 'stage to build (indicates compiler to use/test, e.g., stage 0 uses the bootstrap compiler, stage 1 the stage 0 rustc artifacts, etc.)')
+ [CompletionResult]::new('--keep-stage', 'keep-stage', [CompletionResultType]::ParameterName, 'stage(s) to keep without recompiling (pass multiple times to keep e.g., both stages 0 and 1)')
+ [CompletionResult]::new('--keep-stage-std', 'keep-stage-std', [CompletionResultType]::ParameterName, 'stage(s) of the standard library to keep without recompiling (pass multiple times to keep e.g., both stages 0 and 1)')
+ [CompletionResult]::new('--src', 'src', [CompletionResultType]::ParameterName, 'path to the root of the rust checkout')
+ [CompletionResult]::new('-j', 'j', [CompletionResultType]::ParameterName, 'number of jobs to run in parallel')
+ [CompletionResult]::new('--jobs', 'jobs', [CompletionResultType]::ParameterName, 'number of jobs to run in parallel')
+ [CompletionResult]::new('--warnings', 'warnings', [CompletionResultType]::ParameterName, 'if value is deny, will deny warnings if value is warn, will emit warnings otherwise, use the default configured behaviour')
+ [CompletionResult]::new('--error-format', 'error-format', [CompletionResultType]::ParameterName, 'rustc error format')
+ [CompletionResult]::new('--color', 'color', [CompletionResultType]::ParameterName, 'whether to use color in cargo and rustc output')
+ [CompletionResult]::new('--llvm-skip-rebuild', 'llvm-skip-rebuild', [CompletionResultType]::ParameterName, 'whether rebuilding llvm should be skipped, overriding `skip-rebuld` in config.toml')
+ [CompletionResult]::new('--rust-profile-generate', 'rust-profile-generate', [CompletionResultType]::ParameterName, 'generate PGO profile with rustc build')
+ [CompletionResult]::new('--rust-profile-use', 'rust-profile-use', [CompletionResultType]::ParameterName, 'use PGO profile for rustc build')
+ [CompletionResult]::new('--llvm-profile-use', 'llvm-profile-use', [CompletionResultType]::ParameterName, 'use PGO profile for LLVM build')
+ [CompletionResult]::new('--reproducible-artifact', 'reproducible-artifact', [CompletionResultType]::ParameterName, 'Additional reproducible artifacts that should be added to the reproducible artifacts archive')
+ [CompletionResult]::new('--set', 'set', [CompletionResultType]::ParameterName, 'override options in config.toml')
+ [CompletionResult]::new('--versioned-dirs', 'versioned-dirs', [CompletionResultType]::ParameterName, 'Always include version in subdir name')
+ [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'use verbose output (-vv for very verbose)')
+ [CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'use verbose output (-vv for very verbose)')
+ [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'use incremental compilation')
+ [CompletionResult]::new('--incremental', 'incremental', [CompletionResultType]::ParameterName, 'use incremental compilation')
+ [CompletionResult]::new('--include-default-paths', 'include-default-paths', [CompletionResultType]::ParameterName, 'include default paths in addition to the provided ones')
+ [CompletionResult]::new('--dry-run', 'dry-run', [CompletionResultType]::ParameterName, 'dry run; don''t build anything')
+ [CompletionResult]::new('--dump-bootstrap-shims', 'dump-bootstrap-shims', [CompletionResultType]::ParameterName, 'Indicates whether to dump the work done from bootstrap shims')
+ [CompletionResult]::new('--json-output', 'json-output', [CompletionResultType]::ParameterName, 'use message-format=json')
+ [CompletionResult]::new('--bypass-bootstrap-lock', 'bypass-bootstrap-lock', [CompletionResultType]::ParameterName, 'Bootstrap uses this value to decide whether it should bypass locking the build process. This is rarely needed (e.g., compiling the std library for different targets in parallel)')
+ [CompletionResult]::new('--llvm-profile-generate', 'llvm-profile-generate', [CompletionResultType]::ParameterName, 'generate PGO profile with llvm built for rustc')
+ [CompletionResult]::new('--enable-bolt-settings', 'enable-bolt-settings', [CompletionResultType]::ParameterName, 'Enable BOLT link flags')
+ [CompletionResult]::new('--skip-stage0-validation', 'skip-stage0-validation', [CompletionResultType]::ParameterName, 'Skip stage0 compiler validation')
+ [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
+ [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
+ break
+ }
})
$completions.Where{ $_.CompletionText -like "$wordToComplete*" } |
diff --git a/src/etc/completions/x.py.sh b/src/etc/completions/x.py.sh
index 1f1a9a70767fa..82cacb52ffeef 100644
--- a/src/etc/completions/x.py.sh
+++ b/src/etc/completions/x.py.sh
@@ -57,6 +57,9 @@ _x.py() {
bootstrap,test)
cmd="bootstrap__test"
;;
+ bootstrap,vendor)
+ cmd="bootstrap__vendor"
+ ;;
*)
;;
esac
@@ -64,7 +67,7 @@ _x.py() {
case "${cmd}" in
x.py)
- opts="-v -i -j -h --verbose --incremental --config --build-dir --build --host --target --exclude --skip --include-default-paths --rustc-error-format --on-fail --dry-run --dump-bootstrap-shims --stage --keep-stage --keep-stage-std --src --jobs --warnings --error-format --json-output --color --bypass-bootstrap-lock --llvm-skip-rebuild --rust-profile-generate --rust-profile-use --llvm-profile-use --llvm-profile-generate --enable-bolt-settings --skip-stage0-validation --reproducible-artifact --set --help [PATHS]... [ARGS]... build check clippy fix fmt doc test miri bench clean dist install run setup suggest"
+ opts="-v -i -j -h --verbose --incremental --config --build-dir --build --host --target --exclude --skip --include-default-paths --rustc-error-format --on-fail --dry-run --dump-bootstrap-shims --stage --keep-stage --keep-stage-std --src --jobs --warnings --error-format --json-output --color --bypass-bootstrap-lock --llvm-skip-rebuild --rust-profile-generate --rust-profile-use --llvm-profile-use --llvm-profile-generate --enable-bolt-settings --skip-stage0-validation --reproducible-artifact --set --help [PATHS]... [ARGS]... build check clippy fix fmt doc test miri bench clean dist install run setup suggest vendor"
if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
@@ -1879,6 +1882,120 @@ _x.py() {
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
;;
+ x.py__vendor)
+ opts="-v -i -j -h --sync --versioned-dirs --verbose --incremental --config --build-dir --build --host --target --exclude --skip --include-default-paths --rustc-error-format --on-fail --dry-run --dump-bootstrap-shims --stage --keep-stage --keep-stage-std --src --jobs --warnings --error-format --json-output --color --bypass-bootstrap-lock --llvm-skip-rebuild --rust-profile-generate --rust-profile-use --llvm-profile-use --llvm-profile-generate --enable-bolt-settings --skip-stage0-validation --reproducible-artifact --set --help [PATHS]... [ARGS]..."
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+ case "${prev}" in
+ --sync)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ --config)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ --build-dir)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ --build)
+ COMPREPLY=("${cur}")
+ return 0
+ ;;
+ --host)
+ COMPREPLY=("${cur}")
+ return 0
+ ;;
+ --target)
+ COMPREPLY=("${cur}")
+ return 0
+ ;;
+ --exclude)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ --skip)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ --rustc-error-format)
+ COMPREPLY=("${cur}")
+ return 0
+ ;;
+ --on-fail)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ --stage)
+ COMPREPLY=("${cur}")
+ return 0
+ ;;
+ --keep-stage)
+ COMPREPLY=("${cur}")
+ return 0
+ ;;
+ --keep-stage-std)
+ COMPREPLY=("${cur}")
+ return 0
+ ;;
+ --src)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ --jobs)
+ COMPREPLY=("${cur}")
+ return 0
+ ;;
+ -j)
+ COMPREPLY=("${cur}")
+ return 0
+ ;;
+ --warnings)
+ COMPREPLY=($(compgen -W "deny warn default" -- "${cur}"))
+ return 0
+ ;;
+ --error-format)
+ COMPREPLY=("${cur}")
+ return 0
+ ;;
+ --color)
+ COMPREPLY=($(compgen -W "always never auto" -- "${cur}"))
+ return 0
+ ;;
+ --llvm-skip-rebuild)
+ COMPREPLY=($(compgen -W "true false" -- "${cur}"))
+ return 0
+ ;;
+ --rust-profile-generate)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ --rust-profile-use)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ --llvm-profile-use)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ --reproducible-artifact)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ --set)
+ COMPREPLY=("${cur}")
+ return 0
+ ;;
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ ;;
esac
}
diff --git a/src/etc/completions/x.py.zsh b/src/etc/completions/x.py.zsh
index b920309ac2c15..12e96dbd40a31 100644
--- a/src/etc/completions/x.py.zsh
+++ b/src/etc/completions/x.py.zsh
@@ -742,6 +742,51 @@ _arguments "${_arguments_options[@]}" \
'--help[Print help (see more with '\''--help'\'')]' \
'*::paths -- paths for the subcommand:_files' \
&& ret=0
+;;
+(vendor)
+_arguments "${_arguments_options[@]}" \
+'*--sync=[Additional \`Cargo.toml\` to sync and vendor]:SYNC:_files' \
+'--config=[TOML configuration file for build]:FILE:_files' \
+'--build-dir=[Build directory, overrides \`build.build-dir\` in \`config.toml\`]:DIR:_files -/' \
+'--build=[build target of the stage0 compiler]:BUILD:( )' \
+'--host=[host targets to build]:HOST:( )' \
+'--target=[target targets to build]:TARGET:( )' \
+'*--exclude=[build paths to exclude]:PATH:_files' \
+'*--skip=[build paths to skip]:PATH:_files' \
+'--rustc-error-format=[]:RUSTC_ERROR_FORMAT:( )' \
+'--on-fail=[command to run on failure]:CMD:_cmdstring' \
+'--stage=[stage to build (indicates compiler to use/test, e.g., stage 0 uses the bootstrap compiler, stage 1 the stage 0 rustc artifacts, etc.)]:N:( )' \
+'*--keep-stage=[stage(s) to keep without recompiling (pass multiple times to keep e.g., both stages 0 and 1)]:N:( )' \
+'*--keep-stage-std=[stage(s) of the standard library to keep without recompiling (pass multiple times to keep e.g., both stages 0 and 1)]:N:( )' \
+'--src=[path to the root of the rust checkout]:DIR:_files -/' \
+'-j+[number of jobs to run in parallel]:JOBS:( )' \
+'--jobs=[number of jobs to run in parallel]:JOBS:( )' \
+'--warnings=[if value is deny, will deny warnings if value is warn, will emit warnings otherwise, use the default configured behaviour]:deny|warn:(deny warn default)' \
+'--error-format=[rustc error format]:FORMAT:( )' \
+'--color=[whether to use color in cargo and rustc output]:STYLE:(always never auto)' \
+'--llvm-skip-rebuild=[whether rebuilding llvm should be skipped, overriding \`skip-rebuld\` in config.toml]:VALUE:(true false)' \
+'--rust-profile-generate=[generate PGO profile with rustc build]:PROFILE:_files' \
+'--rust-profile-use=[use PGO profile for rustc build]:PROFILE:_files' \
+'--llvm-profile-use=[use PGO profile for LLVM build]:PROFILE:_files' \
+'*--reproducible-artifact=[Additional reproducible artifacts that should be added to the reproducible artifacts archive]:REPRODUCIBLE_ARTIFACT: ' \
+'*--set=[override options in config.toml]:section.option=value:( )' \
+'--versioned-dirs[Always include version in subdir name]' \
+'*-v[use verbose output (-vv for very verbose)]' \
+'*--verbose[use verbose output (-vv for very verbose)]' \
+'-i[use incremental compilation]' \
+'--incremental[use incremental compilation]' \
+'--include-default-paths[include default paths in addition to the provided ones]' \
+'--dry-run[dry run; don'\''t build anything]' \
+'--dump-bootstrap-shims[Indicates whether to dump the work done from bootstrap shims]' \
+'--json-output[use message-format=json]' \
+'--bypass-bootstrap-lock[Bootstrap uses this value to decide whether it should bypass locking the build process. This is rarely needed (e.g., compiling the std library for different targets in parallel)]' \
+'--llvm-profile-generate[generate PGO profile with llvm built for rustc]' \
+'--enable-bolt-settings[Enable BOLT link flags]' \
+'--skip-stage0-validation[Skip stage0 compiler validation]' \
+'-h[Print help (see more with '\''--help'\'')]' \
+'--help[Print help (see more with '\''--help'\'')]' \
+'*::paths -- paths for the subcommand:_files' \
+&& ret=0
;;
esac
;;
@@ -766,6 +811,7 @@ _x.py_commands() {
'run:Run tools contained in this repository' \
'setup:Set up the environment for development' \
'suggest:Suggest a subset of tests to run, based on modified files' \
+'vendor:Vendor dependencies' \
)
_describe -t commands 'x.py commands' commands "$@"
}
@@ -844,6 +890,11 @@ _x.py__test_commands() {
local commands; commands=()
_describe -t commands 'x.py test commands' commands "$@"
}
+(( $+functions[_x.py__vendor_commands] )) ||
+_x.py__vendor_commands() {
+ local commands; commands=()
+ _describe -t commands 'x.py vendor commands' commands "$@"
+}
if [ "$funcstack[1]" = "_x.py" ]; then
_x.py "$@"
From 6dd011de64c2d6299a1dc3aa16d44d1b23ac2bae Mon Sep 17 00:00:00 2001
From: onur-ozkan <work@onurozkan.dev>
Date: Sun, 14 Apr 2024 23:08:19 +0300
Subject: [PATCH 11/18] suggest `x.py vendor` instead of `cargo vendor`
Signed-off-by: onur-ozkan <work@onurozkan.dev>
---
src/bootstrap/bootstrap.py | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 39add60e705fe..e464e444fea20 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -1035,14 +1035,8 @@ def check_vendored_status(self):
if self.use_vendored_sources:
vendor_dir = os.path.join(self.rust_root, 'vendor')
if not os.path.exists(vendor_dir):
- sync_dirs = "--sync ./src/tools/cargo/Cargo.toml " \
- "--sync ./src/tools/rust-analyzer/Cargo.toml " \
- "--sync ./compiler/rustc_codegen_cranelift/Cargo.toml " \
- "--sync ./compiler/rustc_codegen_gcc/Cargo.toml " \
- "--sync ./src/bootstrap/Cargo.toml "
eprint('ERROR: vendoring required, but vendor directory does not exist.')
- eprint(' Run `cargo vendor {}` to initialize the '
- 'vendor directory.'.format(sync_dirs))
+ eprint(' Run `x.py vendor` to initialize the vendor directory.')
eprint(' Alternatively, use the pre-vendored `rustc-src` dist component.')
eprint(' To get a stable/beta/nightly version, download it from: ')
eprint(' '
From 25babe9a79a2c5d35211e0d6bad348637ef2a246 Mon Sep 17 00:00:00 2001
From: The 8472 <git@infinite-source.de>
Date: Sun, 21 Apr 2024 16:34:42 +0200
Subject: [PATCH 12/18] export assert_unsafe_precondition macro for
std-internal use
---
library/core/src/intrinsics.rs | 2 +-
library/core/src/lib.rs | 4 +++-
library/core/src/ub_checks.rs | 8 ++++++--
library/std/src/lib.rs | 1 +
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/library/core/src/intrinsics.rs b/library/core/src/intrinsics.rs
index 9406efd7ab24a..7d2b84b986469 100644
--- a/library/core/src/intrinsics.rs
+++ b/library/core/src/intrinsics.rs
@@ -2720,7 +2720,7 @@ pub const unsafe fn typed_swap<T>(x: *mut T, y: *mut T) {
#[unstable(feature = "core_intrinsics", issue = "none")]
#[inline(always)]
#[cfg_attr(not(bootstrap), rustc_intrinsic)] // just make it a regular fn in bootstrap
-pub(crate) const fn ub_checks() -> bool {
+pub const fn ub_checks() -> bool {
cfg!(debug_assertions)
}
diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs
index 154565b6fee17..a7dcc4992f506 100644
--- a/library/core/src/lib.rs
+++ b/library/core/src/lib.rs
@@ -193,6 +193,7 @@
#![feature(str_split_inclusive_remainder)]
#![feature(str_split_remainder)]
#![feature(strict_provenance)]
+#![feature(ub_checks)]
#![feature(unchecked_shifts)]
#![feature(utf16_extra)]
#![feature(utf16_extra_const)]
@@ -370,7 +371,8 @@ pub mod hint;
pub mod intrinsics;
pub mod mem;
pub mod ptr;
-mod ub_checks;
+#[unstable(feature = "ub_checks", issue = "none")]
+pub mod ub_checks;
/* Core language traits */
diff --git a/library/core/src/ub_checks.rs b/library/core/src/ub_checks.rs
index ff6b2d3053956..1aa6a288e7082 100644
--- a/library/core/src/ub_checks.rs
+++ b/library/core/src/ub_checks.rs
@@ -46,6 +46,8 @@ use crate::intrinsics::{self, const_eval_select};
/// variables cannot be optimized out in MIR, an innocent-looking `let` can produce enough
/// debuginfo to have a measurable compile-time impact on debug builds.
#[allow_internal_unstable(const_ub_checks)] // permit this to be called in stably-const fn
+#[macro_export]
+#[unstable(feature = "ub_checks", issue = "none")]
macro_rules! assert_unsafe_precondition {
($kind:ident, $message:expr, ($($name:ident:$ty:ty = $arg:expr),*$(,)?) => $e:expr $(,)?) => {
{
@@ -75,11 +77,13 @@ macro_rules! assert_unsafe_precondition {
}
};
}
-pub(crate) use assert_unsafe_precondition;
+#[unstable(feature = "ub_checks", issue = "none")]
+pub use assert_unsafe_precondition;
/// Checking library UB is always enabled when UB-checking is done
/// (and we use a reexport so that there is no unnecessary wrapper function).
-pub(crate) use intrinsics::ub_checks as check_library_ub;
+#[unstable(feature = "ub_checks", issue = "none")]
+pub use intrinsics::ub_checks as check_library_ub;
/// Determines whether we should check for language UB.
///
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index 241a443fab96e..3055c638e2cf7 100644
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -358,6 +358,7 @@
#![feature(str_internals)]
#![feature(strict_provenance)]
#![feature(strict_provenance_atomic_ptr)]
+#![feature(ub_checks)]
// tidy-alphabetical-end
//
// Library features (alloc):
From 072c32d467b3afbd8738e34958ef487ca00b69c2 Mon Sep 17 00:00:00 2001
From: The 8472 <git@infinite-source.de>
Date: Sun, 21 Apr 2024 17:19:15 +0200
Subject: [PATCH 13/18] put FD validity behind late debug_asserts checking
uses the same machinery as assert_unsafe_precondition
---
library/std/src/os/fd/owned.rs | 12 +-------
library/std/src/sys/pal/unix/fs.rs | 47 ++++++++++++++++++------------
2 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/library/std/src/os/fd/owned.rs b/library/std/src/os/fd/owned.rs
index 8c421540af40e..9970827fec8cc 100644
--- a/library/std/src/os/fd/owned.rs
+++ b/library/std/src/os/fd/owned.rs
@@ -177,17 +177,7 @@ impl Drop for OwnedFd {
// opened after we closed ours.
#[cfg(not(target_os = "hermit"))]
{
- use crate::sys::os::errno;
- // ideally this would use assert_unsafe_precondition!, but that's only in core
- if cfg!(debug_assertions) {
- // close() can bubble up error codes from FUSE which can send semantically
- // inappropriate error codes including EBADF.
- // So we check file flags instead which live on the file descriptor and not the underlying file.
- // The downside is that it costs an extra syscall, so we only do it for debug.
- if libc::fcntl(self.fd, libc::F_GETFD) == -1 && errno() == libc::EBADF {
- rtabort!("IO Safety violation: owned file descriptor already closed");
- }
- }
+ crate::sys::fs::debug_assert_fd_is_open(self.fd);
let _ = libc::close(self.fd);
}
#[cfg(target_os = "hermit")]
diff --git a/library/std/src/sys/pal/unix/fs.rs b/library/std/src/sys/pal/unix/fs.rs
index 2d57a9d81c911..0a86d28c2e3b3 100644
--- a/library/std/src/sys/pal/unix/fs.rs
+++ b/library/std/src/sys/pal/unix/fs.rs
@@ -868,28 +868,39 @@ impl Iterator for ReadDir {
}
}
+/// Aborts the process if a file desceriptor is not open, if debug asserts are enabled
+///
+/// Many IO syscalls can't be fully trusted about EBADF error codes because those
+/// might get bubbled up from a remote FUSE server rather than the file descriptor
+/// in the current process being invalid.
+///
+/// So we check file flags instead which live on the file descriptor and not the underlying file.
+/// The downside is that it costs an extra syscall, so we only do it for debug.
+#[inline]
+pub(crate) fn debug_assert_fd_is_open(fd: RawFd) {
+ use crate::sys::os::errno;
+
+ // this is similar to assert_unsafe_precondition!() but it doesn't require const
+ if core::ub_checks::check_library_ub() {
+ if unsafe { libc::fcntl(fd, libc::F_GETFD) } == -1 && errno() == libc::EBADF {
+ rtabort!("IO Safety violation: owned file descriptor already closed");
+ }
+ }
+}
+
impl Drop for Dir {
fn drop(&mut self) {
- // ideally this would use assert_unsafe_precondition!, but that's only in core
- #[cfg(all(
- debug_assertions,
- not(any(
- target_os = "redox",
- target_os = "nto",
- target_os = "vita",
- target_os = "hurd",
- ))
- ))]
+ // dirfd isn't supported everywhere
+ #[cfg(not(any(
+ miri,
+ target_os = "redox",
+ target_os = "nto",
+ target_os = "vita",
+ target_os = "hurd",
+ )))]
{
- use crate::sys::os::errno;
- // close() can bubble up error codes from FUSE which can send semantically
- // inappropriate error codes including EBADF.
- // So we check file flags instead which live on the file descriptor and not the underlying file.
- // The downside is that it costs an extra syscall, so we only do it for debug.
let fd = unsafe { libc::dirfd(self.0) };
- if unsafe { libc::fcntl(fd, libc::F_GETFD) } == -1 && errno() == libc::EBADF {
- rtabort!("IO Safety violation: DIR*'s owned file descriptor already closed");
- }
+ debug_assert_fd_is_open(fd);
}
let r = unsafe { libc::closedir(self.0) };
assert!(
From 32aadc516bb2dad9913d2600da5dd1d4478e552f Mon Sep 17 00:00:00 2001
From: Jubilee Young <workingjubilee@gmail.com>
Date: Wed, 24 Apr 2024 16:47:47 -0700
Subject: [PATCH 14/18] bootstrap: link to the forge about toolstate
---
src/bootstrap/src/core/build_steps/toolstate.rs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/bootstrap/src/core/build_steps/toolstate.rs b/src/bootstrap/src/core/build_steps/toolstate.rs
index 6065aa1414fe1..c123bc764ffe5 100644
--- a/src/bootstrap/src/core/build_steps/toolstate.rs
+++ b/src/bootstrap/src/core/build_steps/toolstate.rs
@@ -1,6 +1,8 @@
-//! Toolstate checks to keep tools building
+//! [Toolstate] checks to keep tools building
//!
//! Reachable via `./x.py test` but mostly relevant for CI, since it isn't run locally by default.
+//!
+//! [Toolstate]: https://forge.rust-lang.org/infra/toolstate.html
use crate::core::builder::{Builder, RunConfig, ShouldRun, Step};
use crate::utils::helpers::t;
From f4e02a193e39958df1cee6abeefc62e50354fdea Mon Sep 17 00:00:00 2001
From: Jubilee Young <workingjubilee@gmail.com>
Date: Wed, 24 Apr 2024 16:56:41 -0700
Subject: [PATCH 15/18] bootstrap: reinterpret the main advantage of x.py setup
---
src/bootstrap/src/core/build_steps/setup.rs | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/bootstrap/src/core/build_steps/setup.rs b/src/bootstrap/src/core/build_steps/setup.rs
index a01d20e8c21ad..6200941458025 100644
--- a/src/bootstrap/src/core/build_steps/setup.rs
+++ b/src/bootstrap/src/core/build_steps/setup.rs
@@ -1,8 +1,9 @@
//! First time setup of a dev environment
//!
//! These are build-and-run steps for `./x.py setup`, which allows quickly setting up the directory
-//! for modifying, building, and running the compiler and library. The main convenience is to allow
-//! not having to painstakingly set every single option in config.toml.
+//! for modifying, building, and running the compiler and library. Running arbitrary configuration
+//! allows setting up things that cannot be simply captured inside the config.toml, in addition to
+//! leading people away from manually editing most of the config.toml values.
use crate::core::builder::{Builder, RunConfig, ShouldRun, Step};
use crate::t;
From 5b5ee0e7bd527d062143e5fe728d69f0f7e09bc9 Mon Sep 17 00:00:00 2001
From: Alex Macleod <alex@macleod.io>
Date: Fri, 26 Apr 2024 15:35:43 +0100
Subject: [PATCH 16/18] Remove unused `[patch]` for clippy_lints
---
Cargo.toml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index bbf4ecfe61d07..1379e4cd3bfdb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -112,6 +112,3 @@ strip = true
rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
-
-[patch."https://github.com/rust-lang/rust-clippy"]
-clippy_lints = { path = "src/tools/clippy/clippy_lints" }
From 4e83776731b1b80f999d89fed4f382641119bbfb Mon Sep 17 00:00:00 2001
From: Martin Nordholts <martin.nordholts@codetale.se>
Date: Sat, 27 Apr 2024 08:05:32 +0200
Subject: [PATCH 17/18] bootstrap: Document `struct Builder` and its fields
---
src/bootstrap/src/core/builder.rs | 21 +++++++++++++++++++++
src/bootstrap/src/core/config/config.rs | 2 ++
2 files changed, 23 insertions(+)
diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs
index adef9ebd0e306..dc01f616c2cc3 100644
--- a/src/bootstrap/src/core/builder.rs
+++ b/src/bootstrap/src/core/builder.rs
@@ -34,13 +34,34 @@ use once_cell::sync::Lazy;
#[cfg(test)]
mod tests;
+/// Builds and performs different [`Self::kind`]s of stuff and actions, taking
+/// into account build configuration from e.g. config.toml.
pub struct Builder<'a> {
+ /// Build configuration from e.g. config.toml.
pub build: &'a Build,
+
+ /// The stage to use. Either implicitly determined based on subcommand, or
+ /// explicitly specified with `--stage N`. Normally this is the stage we
+ /// use, but sometimes we want to run steps with a lower stage than this.
pub top_stage: u32,
+
+ /// What to build or what action to perform.
pub kind: Kind,
+
+ /// A cache of outputs of [`Step`]s so we can avoid running steps we already
+ /// ran.
cache: Cache,
+
+ /// A stack of [`Step`]s to run before we can run this builder. The output
+ /// of steps is cached in [`Self::cache`].
stack: RefCell<Vec<Box<dyn Any>>>,
+
+ /// The total amount of time we spent running [`Step`]s in [`Self::stack`].
time_spent_on_dependencies: Cell<Duration>,
+
+ /// The paths passed on the command line. Used by steps to figure out what
+ /// to do. For example: with `./x check foo bar` we get `paths=["foo",
+ /// "bar"]`.
pub paths: Vec<PathBuf>,
}
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index 2acce6273598c..019413ee56295 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -345,6 +345,8 @@ pub struct Config {
#[cfg(test)]
pub initial_rustfmt: RefCell<RustfmtState>,
+ /// The paths to work with. For example: with `./x check foo bar` we get
+ /// `paths=["foo", "bar"]`.
pub paths: Vec<PathBuf>,
}
From fa73ebb303d3c6416c6e67d3184506b6a7883335 Mon Sep 17 00:00:00 2001
From: Jubilee Young <workingjubilee@gmail.com>
Date: Sat, 27 Apr 2024 11:29:24 -0700
Subject: [PATCH 18/18] Unconditionally call really_init
This makes miri not diverge in behavior, it fixes running Rust linux-gnu
binaries on musl with gcompat, it fixes dlopen edge-cases that cranelift
somehow hits, etc.
---
library/std/src/sys/pal/unix/args.rs | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/library/std/src/sys/pal/unix/args.rs b/library/std/src/sys/pal/unix/args.rs
index acf8100d47f23..afe703bcb2f28 100644
--- a/library/std/src/sys/pal/unix/args.rs
+++ b/library/std/src/sys/pal/unix/args.rs
@@ -98,12 +98,10 @@ mod imp {
}
#[inline(always)]
- pub unsafe fn init(_argc: isize, _argv: *const *const u8) {
- // On Linux-GNU, we rely on `ARGV_INIT_ARRAY` below to initialize
- // `ARGC` and `ARGV`. But in Miri that does not actually happen so we
- // still initialize here.
- #[cfg(any(miri, not(all(target_os = "linux", target_env = "gnu"))))]
- really_init(_argc, _argv);
+ pub unsafe fn init(argc: isize, argv: *const *const u8) {
+ // on GNU/Linux if we are main then we will init argv and argc twice, it "duplicates work"
+ // BUT edge-cases are real: only using .init_array can break most emulators, dlopen, etc.
+ really_init(argc, argv);
}
/// glibc passes argc, argv, and envp to functions in .init_array, as a non-standard extension.