itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #13982 - VitalikButerinEth:master, r=hi-rustin

Browse Source 
chore: fix some comments
This commit is contained in:
bors 2024-05-30 12:50:08 +00:00
commit 0b72605141
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cargo/core/compiler/job_queue/mod.rs
View File

@ -1050,7 +1050,7 @@ impl<'gctx> DrainState<'gctx> {
if unit.is_local() { if unit.is_local() {
// Do not show this if there are any errors or no fixable warnings // Do not show this if there are any errors or no fixable warnings
if let FixableWarnings::Positive(fixable) = count.fixable { if let FixableWarnings::Positive(fixable) = count.fixable {
// `cargo fix` doesnt have an option for custom builds // `cargo fix` doesn't have an option for custom builds
if !unit.target.is_custom_build() { if !unit.target.is_custom_build() {
// To make sure the correct command is shown for `clippy` we // To make sure the correct command is shown for `clippy` we
// check if `RUSTC_WORKSPACE_WRAPPER` is set and pointing towards // check if `RUSTC_WORKSPACE_WRAPPER` is set and pointing towards

2
src/cargo/ops/resolve.rs
View File

@ -899,7 +899,7 @@ fn register_patch_entries(
} }
/// Locks each `[replace]` entry to a specific Package ID /// Locks each `[replace]` entry to a specific Package ID
/// if the lockfile contains any correspoding previous replacement. /// if the lockfile contains any corresponding previous replacement.
fn lock_replacements( fn lock_replacements(
ws: &Workspace<'_>, ws: &Workspace<'_>,
previous: Option<&Resolve>, previous: Option<&Resolve>,

2
src/cargo/sources/source.rs
View File

@ -184,7 +184,7 @@ pub enum QueryKind {
/// whereas an `Registry` source may return dependencies that have the same /// whereas an `Registry` source may return dependencies that have the same
/// canonicalization. /// canonicalization.
Alternatives, Alternatives,
/// Match a denpendency in all ways and will normalize the package name. /// Match a dependency in all ways and will normalize the package name.
/// Each source defines what normalizing means. /// Each source defines what normalizing means.
Normalized, Normalized,
} }