Skip to content

Commit

Permalink
Auto merge of rust-lang#13982 - VitalikButerinEth:master, r=hi-rustin
Browse files Browse the repository at this point in the history
chore: fix some comments
  • Loading branch information
bors committed May 30, 2024
2 parents 2c8d176 + d3e05d5 commit 0b72605
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/job_queue/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,7 @@ impl<'gctx> DrainState<'gctx> {
if unit.is_local() {
// Do not show this if there are any errors or no fixable warnings
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() {
// To make sure the correct command is shown for `clippy` we
// check if `RUSTC_WORKSPACE_WRAPPER` is set and pointing towards
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/ops/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ fn register_patch_entries(
}

/// 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(
ws: &Workspace<'_>,
previous: Option<&Resolve>,
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/sources/source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ pub enum QueryKind {
/// whereas an `Registry` source may return dependencies that have the same
/// canonicalization.
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.
Normalized,
}
Expand Down

0 comments on commit 0b72605

Please sign in to comment.