Skip to content

Commit 19f6ad0

Browse files
authored
Rollup merge of rust-lang#134473 - acceptacross:master, r=compiler-errors
chore: fix some typos
2 parents 47614ab + 6734a04 commit 19f6ad0

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

Diff for: compiler/rustc_codegen_cranelift/src/compiler_builtins.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::ffi::c_int;
33
#[cfg(feature = "jit")]
44
use std::ffi::c_void;
55

6-
// FIXME replace with core::ffi::c_size_t once stablized
6+
// FIXME replace with core::ffi::c_size_t once stabilized
77
#[allow(non_camel_case_types)]
88
#[cfg(feature = "jit")]
99
type size_t = usize;

Diff for: compiler/rustc_codegen_gcc/src/intrinsic/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ fn get_simple_intrinsic<'gcc, 'tcx>(
6666
sym::log2f64 => "log2",
6767
sym::fmaf32 => "fmaf",
6868
sym::fmaf64 => "fma",
69-
// FIXME: calling `fma` from libc without FMA target feature uses expensive sofware emulation
69+
// FIXME: calling `fma` from libc without FMA target feature uses expensive software emulation
7070
sym::fmuladdf32 => "fmaf", // TODO: use gcc intrinsic analogous to llvm.fmuladd.f32
7171
sym::fmuladdf64 => "fma", // TODO: use gcc intrinsic analogous to llvm.fmuladd.f64
7272
sym::fabsf32 => "fabsf",

Diff for: compiler/rustc_errors/src/emitter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2523,7 +2523,7 @@ impl HumanEmitter {
25232523
buffer.puts(*row_num, max_line_num_len + 1, "+ ", Style::Addition);
25242524
}
25252525
[] => {
2526-
// FIXME: needed? Doesn't get excercised in any test.
2526+
// FIXME: needed? Doesn't get exercised in any test.
25272527
self.draw_col_separator_no_space(buffer, *row_num, max_line_num_len + 1);
25282528
}
25292529
_ => {

Diff for: compiler/rustc_errors/src/markdown/parse.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ fn parse_with_end_pat<'a>(
346346
None
347347
}
348348

349-
/// Resturn `(match, residual)` to end of line. The EOL is returned with the
349+
/// Return `(match, residual)` to end of line. The EOL is returned with the
350350
/// residual.
351351
fn parse_to_newline(buf: &[u8]) -> (&[u8], &[u8]) {
352352
buf.iter().position(|ch| *ch == b'\n').map_or((buf, &[]), |pos| buf.split_at(pos))

Diff for: compiler/rustc_resolve/src/late.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4325,7 +4325,7 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
43254325

43264326
#[inline]
43274327
/// If we're actually rustdoc then avoid giving a name resolution error for `cfg()` items or
4328-
// an invalid `use foo::*;` was found, which can cause unbounded ammounts of "item not found"
4328+
// an invalid `use foo::*;` was found, which can cause unbounded amounts of "item not found"
43294329
// errors. We silence them all.
43304330
fn should_report_errs(&self) -> bool {
43314331
!(self.r.tcx.sess.opts.actually_rustdoc && self.in_func_body)

Diff for: compiler/rustc_trait_selection/src/traits/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ pub fn try_evaluate_const<'tcx>(
599599
// even though it is not something we should ever actually encounter.
600600
//
601601
// Array repeat expr counts are allowed to syntactically use generic parameters
602-
// but must not actually depend on them in order to evalaute succesfully. This means
602+
// but must not actually depend on them in order to evalaute successfully. This means
603603
// that it is actually fine to evalaute them in their own environment rather than with
604604
// the actually provided generic arguments.
605605
tcx.dcx().delayed_bug(

0 commit comments

Comments
 (0)