Skip to content

Commit 0db26e0

Browse files
authored
Rollup merge of #119539 - vuittont60:master, r=TaKO8Ki
Fix typos
2 parents 15c3abd + b2db793 commit 0db26e0

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

compiler/rustc_errors/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1698,7 +1698,7 @@ pub enum Level {
16981698
/// internal overflows, some file operation errors.
16991699
///
17001700
/// Its `EmissionGuarantee` is `FatalAbort`, except in the non-aborting "almost fatal" case
1701-
/// that is occasionaly used, where it is `FatalError`.
1701+
/// that is occasionally used, where it is `FatalError`.
17021702
Fatal,
17031703

17041704
/// An error in the code being compiled, which prevents compilation from finishing. This is the

compiler/rustc_hir_typeck/src/fallback.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ impl<'tcx> FnCtxt<'_, 'tcx> {
8585
return false;
8686
}
8787

88-
// not setting the `fallback_has_occured` field here because
88+
// not setting the `fallback_has_occurred` field here because
8989
// that field is only used for type fallback diagnostics.
9090
for effect in unsolved_effects {
9191
let expected = self.tcx.consts.true_;

src/librustdoc/passes/lint/redundant_explicit_links.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ fn find_resolution(resolutions: &DocLinkResMap, path: &str) -> Option<Res<NodeId
244244
.find_map(|ns| resolutions.get(&(Symbol::intern(path), ns)).copied().flatten())
245245
}
246246

247-
/// Collects all neccessary data of link.
247+
/// Collects all necessary data of link.
248248
fn collect_link_data(offset_iter: &mut OffsetIter<'_, '_>) -> LinkData {
249249
let mut resolvable_link = None;
250250
let mut resolvable_link_range = None;

0 commit comments

Comments
 (0)