1
Fork 0

Rollup merge of #134823 - chloefeal:fix, r=tgross35,dtolnay

Fix typos

This PR focuses on correcting typos and improving clarity in documentation files. Thank you.
This commit is contained in:
David Tolnay 2024-12-27 18:43:03 -08:00 committed by GitHub
commit 9aebd28ca7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 6 additions and 6 deletions

View file

@ -31,7 +31,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
diag: &mut Diag<'_>, diag: &mut Diag<'_>,
) { ) {
// We look at all the locals. Why locals? Because it's the best thing // We look at all the locals. Why locals? Because it's the best thing
// I could think of that's correlated with the *instantiated* higer-ranked // I could think of that's correlated with the *instantiated* higher-ranked
// binder for calls, since we don't really store those anywhere else. // binder for calls, since we don't really store those anywhere else.
for ty in self.body.local_decls.iter().map(|local| local.ty) { for ty in self.body.local_decls.iter().map(|local| local.ty) {
if !ty.has_opaque_types() { if !ty.has_opaque_types() {

View file

@ -220,7 +220,7 @@ fn main() {
let mut cmd = Command::new(&llvm_config); let mut cmd = Command::new(&llvm_config);
cmd.arg(llvm_link_arg).arg("--libs"); cmd.arg(llvm_link_arg).arg("--libs");
// Don't link system libs if cross-compiling unless targetting Windows. // Don't link system libs if cross-compiling unless targeting Windows.
// On Windows system DLLs aren't linked directly, instead import libraries are used. // On Windows system DLLs aren't linked directly, instead import libraries are used.
// These import libraries are independent of the host. // These import libraries are independent of the host.
if !is_crossed || target.contains("windows") { if !is_crossed || target.contains("windows") {

View file

@ -117,7 +117,7 @@ impl<'tcx> TailCallCkVisitor<'_, 'tcx> {
self.report_arguments_mismatch(expr.span, caller_sig, callee_sig); self.report_arguments_mismatch(expr.span, caller_sig, callee_sig);
} }
// FIXME(explicit_tail_calls): this currenly fails for cases where opaques are used. // FIXME(explicit_tail_calls): this currently fails for cases where opaques are used.
// e.g. // e.g.
// ``` // ```
// fn a() -> impl Sized { become b() } // ICE // fn a() -> impl Sized { become b() } // ICE

View file

@ -1843,7 +1843,7 @@ impl<'tcx> SelectionContext<'_, 'tcx> {
// a global and a non-global where-clause. // a global and a non-global where-clause.
// //
// Our handling of where-bounds is generally fairly messy but necessary for backwards // Our handling of where-bounds is generally fairly messy but necessary for backwards
// compatability, see #50825 for why we need to handle global where-bounds like this. // compatibility, see #50825 for why we need to handle global where-bounds like this.
let is_global = |c: ty::PolyTraitPredicate<'tcx>| c.is_global() && !c.has_bound_vars(); let is_global = |c: ty::PolyTraitPredicate<'tcx>| c.is_global() && !c.has_bound_vars();
let param_candidates = candidates let param_candidates = candidates
.iter() .iter()

View file

@ -33,7 +33,7 @@ fn check_is_sorted<T: Ord + Clone + Debug, S: Sort>(v: &mut [T]) {
known_good_stable_sort::sort(known_good_sorted_vec.as_mut_slice()); known_good_stable_sort::sort(known_good_sorted_vec.as_mut_slice());
if is_small_test { if is_small_test {
eprintln!("Orginal: {:?}", v_orig); eprintln!("Original: {:?}", v_orig);
eprintln!("Expected: {:?}", known_good_sorted_vec); eprintln!("Expected: {:?}", known_good_sorted_vec);
eprintln!("Got: {:?}", v); eprintln!("Got: {:?}", v);
} else { } else {

View file

@ -25,7 +25,7 @@ macro_rules! pow_bench_template {
let mut exp_iter = black_box(&exp_array).into_iter(); let mut exp_iter = black_box(&exp_array).into_iter();
(0..ITERATIONS).fold((0 as IntType, false), |acc, _| { (0..ITERATIONS).fold((0 as IntType, false), |acc, _| {
// Sometimes constants don't propogate all the way to the // Sometimes constants don't propagate all the way to the
// inside of the loop, so we call a custom expression every cycle // inside of the loop, so we call a custom expression every cycle
// rather than iter::repeat(CONST) // rather than iter::repeat(CONST)
let base: IntType = $base_macro!(base_iter); let base: IntType = $base_macro!(base_iter);