Skip to content

Commit 9aebd28

Browse files
authored
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.
2 parents dd84b7d + bc05424 commit 9aebd28

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

compiler/rustc_borrowck/src/diagnostics/opaque_suggestions.rs

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

compiler/rustc_llvm/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ fn main() {
220220
let mut cmd = Command::new(&llvm_config);
221221
cmd.arg(llvm_link_arg).arg("--libs");
222222

223-
// Don't link system libs if cross-compiling unless targetting Windows.
223+
// Don't link system libs if cross-compiling unless targeting Windows.
224224
// On Windows system DLLs aren't linked directly, instead import libraries are used.
225225
// These import libraries are independent of the host.
226226
if !is_crossed || target.contains("windows") {

compiler/rustc_mir_build/src/check_tail_calls.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ impl<'tcx> TailCallCkVisitor<'_, 'tcx> {
117117
self.report_arguments_mismatch(expr.span, caller_sig, callee_sig);
118118
}
119119

120-
// FIXME(explicit_tail_calls): this currenly fails for cases where opaques are used.
120+
// FIXME(explicit_tail_calls): this currently fails for cases where opaques are used.
121121
// e.g.
122122
// ```
123123
// fn a() -> impl Sized { become b() } // ICE

compiler/rustc_trait_selection/src/traits/select/mod.rs

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

library/alloc/tests/sort/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fn check_is_sorted<T: Ord + Clone + Debug, S: Sort>(v: &mut [T]) {
3333
known_good_stable_sort::sort(known_good_sorted_vec.as_mut_slice());
3434

3535
if is_small_test {
36-
eprintln!("Orginal: {:?}", v_orig);
36+
eprintln!("Original: {:?}", v_orig);
3737
eprintln!("Expected: {:?}", known_good_sorted_vec);
3838
eprintln!("Got: {:?}", v);
3939
} else {

library/core/benches/num/int_pow/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ macro_rules! pow_bench_template {
2525
let mut exp_iter = black_box(&exp_array).into_iter();
2626

2727
(0..ITERATIONS).fold((0 as IntType, false), |acc, _| {
28-
// Sometimes constants don't propogate all the way to the
28+
// Sometimes constants don't propagate all the way to the
2929
// inside of the loop, so we call a custom expression every cycle
3030
// rather than iter::repeat(CONST)
3131
let base: IntType = $base_macro!(base_iter);

0 commit comments

Comments
 (0)