Skip to content

Commit

Permalink
Fix typos (taking into account review comments)
Browse files Browse the repository at this point in the history
  • Loading branch information
blyxyas committed May 18, 2024
1 parent e6e262f commit e38377d
Show file tree
Hide file tree
Showing 32 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
}

// FIXME: We make sure that this is a normal top-level binding,
// but we could suggest `todo!()` for all uninitialized bindings in the pattern pattern
// but we could suggest `todo!()` for all uninitialized bindings in the pattern
if let hir::StmtKind::Let(hir::LetStmt { span, ty, init: None, pat, .. }) =
&ex.kind
&& let hir::PatKind::Binding(..) = pat.kind
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_hir_typeck/src/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3109,7 +3109,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {

let true_errors = ocx.select_where_possible();

// Do a leak check -- we can't really report report a useful error here,
// Do a leak check -- we can't really report a useful error here,
// but it at least avoids an ICE when the error has to do with higher-ranked
// lifetimes.
self.leak_check(outer_universe, Some(snapshot))?;
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_lint/src/non_local_def.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ declare_lint! {
///
/// Creating non-local definitions go against expectation and can create discrepancies
/// in tooling. It should be avoided. It may become deny-by-default in edition 2024
/// and higher, see see the tracking issue <https://github.com/rust-lang/rust/issues/120363>.
/// and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>.
///
/// An `impl` definition is non-local if it is nested inside an item and neither
/// the type nor the trait are at the same nesting level as the `impl` block.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ fn trait_object_ty<'tcx>(tcx: TyCtxt<'tcx>, poly_trait_ref: ty::PolyTraitRef<'tc
/// if a function is member of the group derived from this type id. Therefore, in the first call to
/// typeid_for_fnabi (when type ids are attached to functions and methods), it can only include at
/// most as much information that would be available in the second call (i.e., during code
/// generation at call sites); otherwise, the type ids would not not match.
/// generation at call sites); otherwise, the type ids would not match.
///
/// For this, it:
///
Expand Down
2 changes: 1 addition & 1 deletion library/core/src/ptr/mut_ptr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ impl<T: ?Sized> *mut T {
///
/// This is similar to `self as usize`, which semantically discards *provenance* and
/// *address-space* information. However, unlike `self as usize`, casting the returned address
/// back to a pointer yields yields a [pointer without provenance][without_provenance_mut], which is undefined
/// back to a pointer yields a [pointer without provenance][without_provenance_mut], which is undefined
/// behavior to dereference. To properly restore the lost information and obtain a
/// dereferenceable pointer, use [`with_addr`][pointer::with_addr] or
/// [`map_addr`][pointer::map_addr].
Expand Down
2 changes: 1 addition & 1 deletion library/portable-simd/crates/core_simd/src/ops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ macro_rules! for_base_types {
#[inline]
#[must_use = "operator returns a new vector without mutating the inputs"]
// TODO: only useful for int Div::div, but we hope that this
// will essentially always always get inlined anyway.
// will essentially always get inlined anyway.
#[track_caller]
fn $call(self, rhs: Self) -> Self::Output {
$macro_impl!(self, rhs, $inner, $scalar)
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 53 files
+15 −14 CHANGELOG.md
+1 −1 Cargo.lock
+4 −4 crates/cargo-test-support/containers/apache/Dockerfile
+3 −4 crates/cargo-test-support/containers/sshd/Dockerfile
+9 −0 crates/cargo-util-schemas/src/manifest/mod.rs
+51 −1 crates/cargo-util/src/paths.rs
+1 −1 crates/rustfix/Cargo.toml
+1 −1 crates/rustfix/tests/everything/multiple-solutions.nightly.fixed.rs
+58 −6 crates/rustfix/tests/everything/multiple-solutions.nightly.json
+0 −0 crates/rustfix/tests/everything/multiple-solutions.nightly.rs
+33 −0 crates/rustfix/tests/parse_and_replace.rs
+1 −1 src/cargo/core/compiler/build_runner/mod.rs
+21 −5 src/cargo/core/compiler/custom_build.rs
+32 −7 src/cargo/core/compiler/mod.rs
+153 −158 src/cargo/core/registry.rs
+1 −1 src/cargo/core/resolver/resolve.rs
+55 −41 src/cargo/ops/resolve.rs
+14 −1 src/cargo/util/toml/mod.rs
+3 −1 src/doc/man/cargo-metadata.md
+3 −1 src/doc/man/generated_txt/cargo-metadata.txt
+3 −1 src/doc/src/commands/cargo-metadata.md
+7 −6 src/doc/src/reference/cargo-targets.md
+5 −3 src/doc/src/reference/external-tools.md
+3 −3 src/doc/src/reference/unstable.md
+3 −1 src/etc/man/cargo-metadata.1
+3 −3 tests/testsuite/bench.rs
+91 −9 tests/testsuite/build_script.rs
+328 −0 tests/testsuite/check_cfg.rs
+12 −13 tests/testsuite/lints/error/mod.rs
+41 −0 tests/testsuite/lints/error/stderr.term.svg
+137 −0 tests/testsuite/lints/implicit_features.rs
+0 −32 tests/testsuite/lints/implicit_features/edition_2021/mod.rs
+0 −33 tests/testsuite/lints/implicit_features/edition_2021/stderr.term.svg
+0 −45 tests/testsuite/lints/implicit_features/edition_2021_warn/mod.rs
+0 −74 tests/testsuite/lints/implicit_features/edition_2021_warn/stderr.term.svg
+0 −43 tests/testsuite/lints/implicit_features/edition_2024/mod.rs
+0 −33 tests/testsuite/lints/implicit_features/edition_2024/stderr.term.svg
+0 −3 tests/testsuite/lints/implicit_features/mod.rs
+3 −3 tests/testsuite/lints/inherited/mod.rs
+10 −12 tests/testsuite/lints/inherited/stderr.term.svg
+330 −0 tests/testsuite/lints/mod.rs
+91 −0 tests/testsuite/lints/unknown_lints.rs
+0 −2 tests/testsuite/lints/unknown_lints/mod.rs
+159 −0 tests/testsuite/lints/unused_optional_dependencies.rs
+0 −33 tests/testsuite/lints/unused_optional_dependencies/edition_2021/stderr.term.svg
+0 −56 tests/testsuite/lints/unused_optional_dependencies/edition_2024/mod.rs
+0 −77 tests/testsuite/lints/unused_optional_dependencies/edition_2024/stderr.term.svg
+0 −3 tests/testsuite/lints/unused_optional_dependencies/mod.rs
+0 −43 tests/testsuite/lints/unused_optional_dependencies/renamed_deps/mod.rs
+0 −77 tests/testsuite/lints/unused_optional_dependencies/renamed_deps/stderr.term.svg
+6 −3 tests/testsuite/lints/warning/mod.rs
+4 −5 tests/testsuite/lints/warning/stderr.term.svg
+2 −326 tests/testsuite/lints_table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ pub(super) fn check<'tcx>(
}
}

/// checks for for collecting into a (generic) method or function argument
/// checks for collecting into a (generic) method or function argument
/// taking an `IntoIterator`
fn check_collect_into_intoiterator<'tcx>(
cx: &LateContext<'tcx>,
Expand Down
2 changes: 1 addition & 1 deletion src/tools/clippy/tests/ui/ptr_arg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ mod issue_9218 {
todo!()
}

// These two's return types don't use use 'a so it's not okay
// These two's return types don't use 'a so it's not okay
fn cow_bad_ret_ty_1<'a>(input: &'a Cow<'a, str>) -> &'static str {
//~^ ERROR: using a reference to `Cow` is not recommended
todo!()
Expand Down
4 changes: 2 additions & 2 deletions src/tools/compiletest/src/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ pub struct Config {
/// Only run tests that match these filters
pub filters: Vec<String>,

/// Skip tests tests matching these substrings. Corresponds to
/// Skip tests matching these substrings. Corresponds to
/// `test::TestOpts::skip`. `filter_exact` does not apply to these flags.
pub skip: Vec<String>,

Expand Down Expand Up @@ -381,7 +381,7 @@ pub struct Config {
/// Whether to rerun tests even if the inputs are unchanged.
pub force_rerun: bool,

/// Only rerun the tests that result has been modified accoring to Git status
/// Only rerun the tests that result has been modified according to Git status
pub only_modified: bool,

pub target_cfgs: OnceLock<TargetCfgs>,
Expand Down
2 changes: 1 addition & 1 deletion src/tools/compiletest/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ fn is_android_gdb_target(target: &str) -> bool {
)
}

/// Returns `true` if the given target is a MSVC target for the purpouses of CDB testing.
/// Returns `true` if the given target is a MSVC target for the purposes of CDB testing.
fn is_pc_windows_msvc_target(target: &str) -> bool {
target.ends_with("-pc-windows-msvc")
}
Expand Down
2 changes: 1 addition & 1 deletion src/tools/jsondoclint/src/validator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const LOCAL_CRATE_ID: u32 = 0;
/// it is well formed. This involves calling `check_*` functions on
/// fields of that item, and `add_*` functions on [`Id`]s.
/// - `add_*`: These add an [`Id`] to the worklist, after validating it to check if
/// the `Id` is a kind expected in this suituation.
/// the `Id` is a kind expected in this situation.
#[derive(Debug)]
pub struct Validator<'a> {
pub(crate) errs: Vec<Error>,
Expand Down
2 changes: 1 addition & 1 deletion src/tools/lld-wrapper/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Script to invoke the bundled rust-lld with the correct flavor.
//!
//! lld supports multiple command line interfaces. If `-flavor <flavor>` are passed as the first
//! `lld` supports multiple command line interfaces. If `-flavor <flavor>` are passed as the first
//! two arguments the `<flavor>` command line interface is used to process the remaining arguments.
//! If no `-flavor` argument is present the flavor is determined by the executable name.
//!
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/cargo-miri/src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ pub fn get_target_dir(meta: &Metadata) -> PathBuf {
output
}

/// Determines where the sysroot of this exeuction is
/// Determines where the sysroot of this execution is
///
/// Either in a user-specified spot by an envar, or in a default cache location.
pub fn get_sysroot_dir() -> PathBuf {
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/miri-script/src/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ impl Command {
cmd!(sh, "git fetch http://localhost:{JOSH_PORT}/rust-lang/rust.git@{commit}{JOSH_FILTER}.git")
.run()
.map_err(|e| {
// Try to un-do the previous `git commit`, to leave the repo in the state we found it it.
// Try to un-do the previous `git commit`, to leave the repo in the state we found it.
cmd!(sh, "git reset --hard HEAD^")
.run()
.expect("FAILED to clean up again after failed `git fetch`, sorry for that");
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/src/borrow_tracker/stacked_borrows/stack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::borrow_tracker::{
};
use crate::ProvenanceExtra;

/// Exactly what cache size we should use is a difficult tradeoff. There will always be some
/// Exactly what cache size we should use is a difficult trade-off. There will always be some
/// workload which has a `BorTag` working set which exceeds the size of the cache, and ends up
/// falling back to linear searches of the borrow stack very often.
/// The cost of making this value too large is that the loop in `Stack::insert` which ensures the
Expand Down
6 changes: 3 additions & 3 deletions src/tools/miri/src/borrow_tracker/tree_borrows/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ struct DisplayFmtWrapper {
warning_text: S,
}

/// Formating of the permissions on each range.
/// Formatting of the permissions on each range.
///
/// Example:
/// ```rust,ignore (private type)
Expand Down Expand Up @@ -422,7 +422,7 @@ struct DisplayFmtPermission {
range_sep: S,
}

/// Formating of the tree structure.
/// Formatting of the tree structure.
///
/// Example:
/// ```rust,ignore (private type)
Expand Down Expand Up @@ -487,7 +487,7 @@ struct DisplayFmtAccess {
meh: S,
}

/// All parameters to determine how the tree is formated.
/// All parameters to determine how the tree is formatted.
struct DisplayFmt {
wrapper: DisplayFmtWrapper,
perm: DisplayFmtPermission,
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/src/borrow_tracker/tree_borrows/perms.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ impl Permission {
Self { inner: Frozen }
}

/// Default initial permission of the root of a new tre at out-of-bounds positions.
/// Default initial permission of the root of a new tree at out-of-bounds positions.
/// Must *only* be used for the root, this is not in general an "initial" permission!
pub fn new_disabled() -> Self {
Self { inner: Disabled }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ mod spurious_read {
/// that causes UB in the target but not in the source.
/// This implementation simply explores the reachable space
/// by all sequences of `TestEvent`.
/// This function can be instanciated with `RetX` and `RetY`
/// This function can be instantiated with `RetX` and `RetY`
/// among `NoRet` or `AllowRet` to resp. forbid/allow `x`/`y` to lose their
/// protector.
fn distinguishable<RetX, RetY>(&self, other: &Self) -> bool
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/src/concurrency/thread.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ pub enum BlockReason {
Condvar(CondvarId),
/// Blocked on a reader-writer lock.
RwLock(RwLockId),
/// Blocled on a Futex variable.
/// Blocked on a Futex variable.
Futex { addr: u64 },
/// Blocked on an InitOnce.
InitOnce(InitOnceId),
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/src/concurrency/weak_memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
//! One consequence of this difference is that safe/sound Rust allows for more operations on atomic locations
//! than the C++20 atomic API was intended to allow, such as non-atomically accessing
//! a previously atomically accessed location, or accessing previously atomically accessed locations with a differently sized operation
//! (such as accessing the top 16 bits of an AtomicU32). These scenarios are generally undiscussed in formalisations of C++ memory model.
//! (such as accessing the top 16 bits of an AtomicU32). These scenarios are generally undiscussed in formalizations of C++ memory model.
//! In Rust, these operations can only be done through a `&mut AtomicFoo` reference or one derived from it, therefore these operations
//! can only happen after all previous accesses on the same locations. This implementation is adapted to allow these operations.
//! A mixed atomicity read that races with writes, or a write that races with reads or writes will still cause UBs to be thrown.
Expand Down
4 changes: 2 additions & 2 deletions src/tools/miri/src/machine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,11 @@ pub enum Provenance {
/// whether *some* exposed pointer could have done what we want to do, and if the answer is yes
/// then we allow the access. This allows too much code in two ways:
/// - The same wildcard pointer can "take the role" of multiple different exposed pointers on
/// subsequenct memory accesses.
/// subsequent memory accesses.
/// - In the aliasing model, we don't just have to know the borrow tag of the pointer used for
/// the access, we also have to update the aliasing state -- and that update can be very
/// different depending on which borrow tag we pick! Stacked Borrows has support for this by
/// switching to a stack that is only approximately known, i.e. we overapproximate the effect
/// switching to a stack that is only approximately known, i.e. we over-approximate the effect
/// of using *any* exposed pointer for this access, and only keep information about the borrow
/// stack that would be true with all possible choices.
Wildcard,
Expand Down
4 changes: 2 additions & 2 deletions src/tools/miri/src/shims/unix/mem.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
//! calls to munmap, but for a very different reason. In principle, according to the man pages, it
//! is possible to unmap arbitrary regions of address space. But in a high-level language like Rust
//! this amounts to partial deallocation, which LLVM does not support. So any attempt to call our
//! munmap shim which would partily unmap a region of address space previously mapped by mmap will
//! munmap shim which would partially unmap a region of address space previously mapped by mmap will
//! report UB.

use crate::*;
Expand Down Expand Up @@ -75,7 +75,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
// * The implementation does not support the combination of accesses requested in the
// prot argument.
//
// Miri doesn't support MAP_FIXED or any any protections other than PROT_READ|PROT_WRITE.
// Miri doesn't support MAP_FIXED or any protections other than PROT_READ|PROT_WRITE.
if flags & map_fixed != 0 || prot != prot_read | prot_write {
this.set_last_error(this.eval_libc("ENOTSUP"))?;
return Ok(this.eval_libc("MAP_FAILED"));
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/src/shims/unix/sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ fn reacquire_cond_mutex<'mir, 'tcx: 'mir>(
Ok(())
}

/// After a thread waiting on a condvar was signalled:
/// After a thread waiting on a condvar was signaled:
/// Reacquire the conditional variable and remove the timeout callback if any
/// was registered.
fn post_cond_signal<'mir, 'tcx: 'mir>(
Expand Down
6 changes: 3 additions & 3 deletions src/tools/miri/src/shims/x86/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ fn int_abs<'tcx>(
Ok(())
}

/// Splits `op` (which must be a SIMD vector) into 128-bit chuncks.
/// Splits `op` (which must be a SIMD vector) into 128-bit chunks.
///
/// Returns a tuple where:
/// * The first element is the number of 128-bit chunks (let's call it `N`).
Expand Down Expand Up @@ -788,7 +788,7 @@ fn split_simd_to_128bit_chunks<'tcx, P: Projectable<'tcx, Provenance>>(
Ok((num_chunks, items_per_chunk, chunked_op))
}

/// Horizontaly performs `which` operation on adjacent values of
/// Horizontally performs `which` operation on adjacent values of
/// `left` and `right` SIMD vectors and stores the result in `dest`.
/// "Horizontal" means that the i-th output element is calculated
/// from the elements 2*i and 2*i+1 of the concatenation of `left` and
Expand Down Expand Up @@ -1256,7 +1256,7 @@ fn packusdw<'tcx>(

/// Negates elements from `left` when the corresponding element in
/// `right` is negative. If an element from `right` is zero, zero
/// is writen to the corresponding output element.
/// is written to the corresponding output element.
/// In other words, multiplies `left` with `right.signum()`.
fn psign<'tcx>(
this: &mut crate::MiriInterpCx<'_, 'tcx>,
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/associated-types/associated-types-eq-2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
struct Bar;
struct Qux;

// Tests for a a non generic trait
// Tests for a non generic trait
pub trait Tr1 {
type A;
fn boo(&self) -> <Self as Tr1>::A;
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/coherence/associated-type2.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! A regression test for #120343. The overlap error was previously
//! silenced in coherence because projecting `<() as ToUnit>::Unit`
//! failed. Then then silenced the missing items error in the `ToUnit`
//! failed. Then silenced the missing items error in the `ToUnit`
//! impl, causing us to not emit any errors and ICEing due to a
//! `span_delay_bug`.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ fn function3<T: Trait<'static, Assoc = usize>>() {
// Trying to normalize the type `for<'a> fn(<T as Trait<'a>>::Assoc)`
// only gets to `<T as Trait<'a>>::Assoc` once `'a` has been already
// instantiated, causing us to prefer the where-bound over the impl
// resulting in a placeholder error. Even if were were to also use the
// resulting in a placeholder error. Even if we were to also use the
// leak check during candidate selection for normalization, this
// case would still not compile.
let _higher_ranked_norm: for<'a> fn(<T as Trait<'a>>::Assoc) = |_| ();
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/parser/label-is-actually-char.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Note: it's ok to interpret 'a as 'a', but but not ok to interpret 'abc as
// Note: it's ok to interpret 'a as 'a', but not ok to interpret 'abc as
// 'abc' because 'abc' is not a valid char literal.

fn main() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// User type annotation in fn bodies is a a valid defining site for opaque types.
// User type annotation in fn bodies is a valid defining site for opaque types.
//@ check-pass
#![feature(type_alias_impl_trait)]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ mod mod3 {
}

// This is similar to the previous cases in that 'a is equal to 'static,
// which is is some sense an implicit parameter to `Opaque`.
// which is some sense an implicit parameter to `Opaque`.
// For example, given a defining use `Opaque<'a> := &'a ()`,
// it is ambiguous whether `Opaque<'a> := &'a ()` or `Opaque<'a> := &'static ()`
mod mod4 {
Expand Down

0 comments on commit e38377d

Please sign in to comment.