Merge branch 'rust-lang:master' into master

Author: Amberley-Sz

Cargo.lock

@@ -63,7 +63,6 @@ indexmap = "2.12.0"
 itertools = "0.14.0"
 jiff = { version = "0.2.15", default-features = false, features = [ "std" ] }
 jobserver = "0.1.34"
-lazycell = "1.3.0"
 libc = "0.2.177"
 libgit2-sys = "0.18.2"
 libloading = "0.8.9"
@@ -185,7 +184,6 @@ indexmap.workspace = true
 itertools.workspace = true
 jiff = { workspace = true, features = ["serde", "std"] }
 jobserver.workspace = true
-lazycell.workspace = true
 libgit2-sys.workspace = true
 memchr.workspace = true
 opener.workspace = true

Cargo.toml

@@ -282,14 +282,14 @@ impl RegistryBuilder {
         self
     }
 
-    /// Sets whether or not to initialize as an alternative registry.
+    /// Initializes as an alternative registry with the given name.
     #[must_use]
     pub fn alternative_named(mut self, alt: &str) -> Self {
         self.alternative = Some(alt.to_string());
         self
     }
 
-    /// Sets whether or not to initialize as an alternative registry.
+    /// Initializes as an alternative registry named "alternative".
     #[must_use]
     pub fn alternative(self) -> Self {
         self.alternative_named("alternative")

crates/cargo-test-support/src/registry.rs

@@ -352,6 +352,13 @@ impl<T> InheritableField<T> {
         }
     }
 
+    pub fn into_value(self) -> Option<T> {
+        match self {
+            Self::Inherit(_) => None,
+            Self::Value(defined) => Some(defined),
+        }
+    }
+
     pub fn is_inherited(&self) -> bool {
         matches!(self, Self::Inherit(_))
     }

crates/cargo-util-schemas/src/manifest/mod.rs

@@ -14,7 +14,7 @@ const COMPRESSED_MAN: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/man.tgz"
 
 pub fn cli() -> Command {
     subcommand("help")
-        .about("Displays help for a cargo subcommand")
+        .about("Displays help for a cargo command")
         .arg(Arg::new("COMMAND").action(ArgAction::Set).add(
             clap_complete::ArgValueCandidates::new(|| {
                 super::builtin()

src/bin/cargo/commands/help.rs

@@ -43,7 +43,8 @@ pub fn cli() -> Command {
         .arg_unit_graph()
         .arg_timings()
         .after_help(color_print::cstr!(
-            "Run `<bright-cyan,bold>cargo help run</>` for more detailed information.\n"
+            "Run `<bright-cyan,bold>cargo help run</>` for more detailed information.\n\
+             To pass `--help` to the specified binary, use `<bright-cyan,bold>-- --help</>`.\n",
         ))
 }
 

src/bin/cargo/commands/run.rs

@@ -212,7 +212,7 @@ fn list_commands(gctx: &GlobalContext) -> BTreeMap<String, CommandInfo> {
     commands.insert(
         "help".to_string(),
         CommandInfo::BuiltIn {
-            about: Some("Displays help for a cargo subcommand".to_string()),
+            about: Some("Displays help for a cargo command".to_string()),
         },
     );
 

src/bin/cargo/main.rs

@@ -1,18 +1,18 @@
 //! See [`CompilationFiles`].
 
+use std::cell::OnceCell;
 use std::collections::HashMap;
 use std::fmt;
 use std::hash::{Hash, Hasher};
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
-use lazycell::LazyCell;
 use tracing::debug;
 
 use super::{BuildContext, BuildRunner, CompileKind, FileFlavor, Layout};
 use crate::core::compiler::{CompileMode, CompileTarget, CrateType, FileType, Unit};
 use crate::core::{Target, TargetKind, Workspace};
-use crate::util::{self, CargoResult, StableHasher};
+use crate::util::{self, CargoResult, OnceExt, StableHasher};
 
 /// This is a generic version number that can be changed to make
 /// backwards-incompatible changes to any file structures in the output
@@ -128,7 +128,7 @@ pub struct CompilationFiles<'a, 'gctx> {
     /// Metadata hash to use for each unit.
     metas: HashMap<Unit, Metadata>,
     /// For each Unit, a list all files produced.
-    outputs: HashMap<Unit, LazyCell<Arc<Vec<OutputFile>>>>,
+    outputs: HashMap<Unit, OnceCell<Arc<Vec<OutputFile>>>>,
 }
 
 /// Info about a single file emitted by the compiler.
@@ -168,7 +168,7 @@ impl<'a, 'gctx: 'a> CompilationFiles<'a, 'gctx> {
         let outputs = metas
             .keys()
             .cloned()
-            .map(|unit| (unit, LazyCell::new()))
+            .map(|unit| (unit, OnceCell::new()))
             .collect();
         CompilationFiles {
             ws: build_runner.bcx.ws,

src/cargo/core/compiler/build_runner/compilation_files.rs

@@ -503,11 +503,19 @@ fn make_absolute_path(
     build_root: &Path,
     path: PathBuf,
 ) -> PathBuf {
-    match ty {
-        DepInfoPathType::PackageRootRelative => pkg_root.join(path),
-        // N.B. path might be absolute here in which case the join will have no effect
-        DepInfoPathType::BuildRootRelative => build_root.join(path),
+    let relative_to = match ty {
+        DepInfoPathType::PackageRootRelative => pkg_root,
+        // N.B. path might be absolute here in which case the join below will have no effect
+        DepInfoPathType::BuildRootRelative => build_root,
+    };
+
+    if path.as_os_str().is_empty() {
+        // Joining with an empty path causes Rust to add a trailing path separator. On Windows, this
+        // would add an invalid trailing backslash to the .d file.
+        return relative_to.to_path_buf();
     }
+
+    relative_to.join(path)
 }
 
 /// Some algorithms are here to ensure compatibility with possible rustc outputs.

src/cargo/core/compiler/fingerprint/dep_info.rs

@@ -52,6 +52,7 @@ pub mod unit_dependencies;
 pub mod unit_graph;
 
 use std::borrow::Cow;
+use std::cell::OnceCell;
 use std::collections::{BTreeMap, HashMap, HashSet};
 use std::env;
 use std::ffi::{OsStr, OsString};
@@ -66,7 +67,6 @@ use annotate_snippets::{AnnotationKind, Group, Level, Renderer, Snippet};
 use anyhow::{Context as _, Error};
 use cargo_platform::{Cfg, Platform};
 use itertools::Itertools;
-use lazycell::LazyCell;
 use regex::Regex;
 use tracing::{debug, instrument, trace};
 
@@ -95,6 +95,7 @@ pub use crate::core::compiler::unit::{Unit, UnitInterner};
 use crate::core::manifest::TargetSourcePath;
 use crate::core::profiles::{PanicStrategy, Profile, StripInner};
 use crate::core::{Feature, PackageId, Target, Verbosity};
+use crate::util::OnceExt;
 use crate::util::context::WarningHandling;
 use crate::util::errors::{CargoResult, VerboseError};
 use crate::util::interning::InternedString;
@@ -1897,7 +1898,7 @@ struct OutputOptions {
     /// is fresh. The file is created lazily so that in the normal case, lots
     /// of empty files are not created. If this is None, the output will not
     /// be cached (such as when replaying cached messages).
-    cache_cell: Option<(PathBuf, LazyCell<File>)>,
+    cache_cell: Option<(PathBuf, OnceCell<File>)>,
     /// If `true`, display any diagnostics.
     /// Other types of JSON messages are processed regardless
     /// of the value of this flag.
@@ -1917,7 +1918,7 @@ impl OutputOptions {
         let path = build_runner.files().message_cache_path(unit);
         // Remove old cache, ignore ENOENT, which is the common case.
         drop(fs::remove_file(&path));
-        let cache_cell = Some((path, LazyCell::new()));
+        let cache_cell = Some((path, OnceCell::new()));
         let show_diagnostics =
             build_runner.bcx.gctx.warning_handling().unwrap_or_default() != WarningHandling::Allow;
         OutputOptions {