Skip to content

Commit 80bb09b

Browse files
authored
Rollup merge of rust-lang#94482 - cuishuang:master, r=Dylan-DPC
compiler: fix some typos
2 parents bf0dfaf + eb2b944 commit 80bb09b

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

compiler/rustc_ast_lowering/src/item.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1366,7 +1366,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
13661366
generics: &Generics,
13671367
itctx: ImplTraitContext<'_, 'hir>,
13681368
) -> GenericsCtor<'hir> {
1369-
// Error if `?Trait` bounds in where clauses don't refer directly to type paramters.
1369+
// Error if `?Trait` bounds in where clauses don't refer directly to type parameters.
13701370
// Note: we used to clone these bounds directly onto the type parameter (and avoid lowering
13711371
// these into hir when we lower thee where clauses), but this makes it quite difficult to
13721372
// keep track of the Span info. Now, `add_implicitly_sized` in `AstConv` checks both param bounds and

compiler/rustc_borrowck/src/region_infer/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1992,7 +1992,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
19921992
.find_map(|constraint| {
19931993
if let ConstraintCategory::Predicate(predicate_span) = constraint.category {
19941994
// We currentl'y doesn't store the `DefId` in the `ConstraintCategory`
1995-
// for perforamnce reasons. The error reporting code used by NLL only
1995+
// for performances reasons. The error reporting code used by NLL only
19961996
// uses the span, so this doesn't cause any problems at the moment.
19971997
Some(ObligationCauseCode::BindingObligation(
19981998
CRATE_DEF_ID.to_def_id(),

compiler/rustc_builtin_macros/src/cfg_eval.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ impl CfgEval<'_, '_> {
203203

204204
// Re-parse the tokens, setting the `capture_cfg` flag to save extra information
205205
// to the captured `AttrAnnotatedTokenStream` (specifically, we capture
206-
// `AttrAnnotatedTokenTree::AttributesData` for all occurences of `#[cfg]` and `#[cfg_attr]`)
206+
// `AttrAnnotatedTokenTree::AttributesData` for all occurrences of `#[cfg]` and `#[cfg_attr]`)
207207
let mut parser =
208208
rustc_parse::stream_to_parser(&self.cfg.sess.parse_sess, orig_tokens, None);
209209
parser.capture_cfg = true;

compiler/rustc_codegen_ssa/src/back/link.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ fn link_natively<'a, B: ArchiveBuilder<'a>>(
990990

991991
// ... and otherwise we're processing a `*.dwp` packed dwarf file.
992992
//
993-
// We cannot rely on the .o paths in the exectuable because they may have been
993+
// We cannot rely on the .o paths in the executable because they may have been
994994
// remapped by --remap-path-prefix and therefore invalid, so we need to provide
995995
// the .o/.dwo paths explicitly.
996996
SplitDebuginfo::Packed => link_dwarf_object(sess, codegen_results, out_filename),

compiler/rustc_codegen_ssa/src/back/linker.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1338,7 +1338,7 @@ impl<'a> Linker for WasmLd<'a> {
13381338
}
13391339

13401340
// LLD will hide these otherwise-internal symbols since it only exports
1341-
// symbols explicity passed via the `--export` flags above and hides all
1341+
// symbols explicitly passed via the `--export` flags above and hides all
13421342
// others. Various bits and pieces of tooling use this, so be sure these
13431343
// symbols make their way out of the linker as well.
13441344
self.cmd.arg("--export=__heap_base");

compiler/rustc_data_structures/src/sso/either_iter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::iter::Iterator;
77
/// one of two specific implementations.
88
///
99
/// Note: For most methods providing custom
10-
/// implementation may margianlly
10+
/// implementation may marginally
1111
/// improve performance by avoiding
1212
/// doing Left/Right match on every step
1313
/// and doing it only once instead.

compiler/rustc_hir/src/definitions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl DefPathTable {
5050
// Continuing with colliding DefPathHashes can lead to correctness
5151
// issues. We must abort compilation.
5252
//
53-
// The likelyhood of such a collision is very small, so actually
53+
// The likelihood of such a collision is very small, so actually
5454
// running into one could be indicative of a poor hash function
5555
// being used.
5656
//

0 commit comments

Comments
 (0)