Skip to content

Commit 05142a7

Browse files
committed
Auto merge of rust-lang#95466 - Dylan-DPC:rollup-g7ddr8y, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - rust-lang#95294 (Document Linux kernel handoff in std::io::copy and std::fs::copy) - rust-lang#95443 (Clarify how `src/tools/x` searches for python) - rust-lang#95452 (fix since field version for termination stabilization) - rust-lang#95460 (Spellchecking compiler code) - rust-lang#95461 (Spellchecking some comments) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents f132bcf + 03b3993 commit 05142a7

File tree

57 files changed

+107
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+107
-87
lines changed

compiler/rustc_apfloat/src/ieee.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ impl<S: Semantics> fmt::Display for IeeeFloat<S> {
461461
(combined / 10) as u32 as Limb
462462
});
463463

464-
// Reduce the sigificand to avoid wasting time dividing 0's.
464+
// Reduce the significand to avoid wasting time dividing 0's.
465465
while sig.last() == Some(&0) {
466466
sig.pop();
467467
}

compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
634634
// This can happen when trying to lower the return type `x` in erroneous code like
635635
// async fn foo(x: u8) -> x {}
636636
// In that case, `x` is lowered as a function parameter, and the return type is lowered as
637-
// an opaque type as a synthetized HIR owner.
637+
// an opaque type as a synthesized HIR owner.
638638
res.unwrap_or(Res::Err)
639639
}
640640

compiler/rustc_ast_passes/src/ast_validation.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -622,9 +622,9 @@ impl<'a> AstValidator<'a> {
622622
}
623623
}
624624

625-
/// Reject C-varadic type unless the function is foreign,
625+
/// Reject C-variadic type unless the function is foreign,
626626
/// or free and `unsafe extern "C"` semantically.
627-
fn check_c_varadic_type(&self, fk: FnKind<'a>) {
627+
fn check_c_variadic_type(&self, fk: FnKind<'a>) {
628628
match (fk.ctxt(), fk.header()) {
629629
(Some(FnCtxt::Foreign), _) => return,
630630
(Some(FnCtxt::Free), Some(header)) => match header.ext {
@@ -1504,7 +1504,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
15041504
};
15051505
self.check_fn_decl(fk.decl(), self_semantic);
15061506

1507-
self.check_c_varadic_type(fk);
1507+
self.check_c_variadic_type(fk);
15081508

15091509
// Functions cannot both be `const async`
15101510
if let Some(FnHeader {

compiler/rustc_borrowck/src/dataflow.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,10 +407,10 @@ impl<'tcx> rustc_mir_dataflow::GenKillAnalysis<'tcx> for Borrows<'_, 'tcx> {
407407
fn terminator_effect(
408408
&self,
409409
trans: &mut impl GenKill<Self::Idx>,
410-
teminator: &mir::Terminator<'tcx>,
410+
terminator: &mir::Terminator<'tcx>,
411411
_location: Location,
412412
) {
413-
if let mir::TerminatorKind::InlineAsm { operands, .. } = &teminator.kind {
413+
if let mir::TerminatorKind::InlineAsm { operands, .. } = &terminator.kind {
414414
for op in operands {
415415
if let mir::InlineAsmOperand::Out { place: Some(place), .. }
416416
| mir::InlineAsmOperand::InOut { out_place: Some(place), .. } = *op

compiler/rustc_borrowck/src/diagnostics/outlives_suggestion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ impl OutlivesSuggestionBuilder {
5555
| RegionNameSource::NamedFreeRegion(..)
5656
| RegionNameSource::Static => true,
5757

58-
// Don't give suggestions for upvars, closure return types, or other unnamable
58+
// Don't give suggestions for upvars, closure return types, or other unnameable
5959
// regions.
6060
RegionNameSource::SynthesizedFreeEnvRegion(..)
6161
| RegionNameSource::AnonRegionFromArgument(..)

compiler/rustc_borrowck/src/diagnostics/region_errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
176176
// FIXME. We should handle this case better. It
177177
// indicates that we have e.g., some region variable
178178
// whose value is like `'a+'b` where `'a` and `'b` are
179-
// distinct unrelated univesal regions that are not
179+
// distinct unrelated universal regions that are not
180180
// known to outlive one another. It'd be nice to have
181181
// some examples where this arises to decide how best
182182
// to report it; we could probably handle it by

compiler/rustc_borrowck/src/invalidation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ impl<'cx, 'tcx> InvalidationGenerator<'cx, 'tcx> {
365365
// borrow); so don't check if they interfere.
366366
//
367367
// NOTE: *reservations* do conflict with themselves;
368-
// thus aren't injecting unsoundenss w/ this check.)
368+
// thus aren't injecting unsoundness w/ this check.)
369369
(Activation(_, activating), _) if activating == borrow_index => {
370370
// Activating a borrow doesn't generate any invalidations, since we
371371
// have already taken the reservation

compiler/rustc_borrowck/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
10481048
// borrow); so don't check if they interfere.
10491049
//
10501050
// NOTE: *reservations* do conflict with themselves;
1051-
// thus aren't injecting unsoundenss w/ this check.)
1051+
// thus aren't injecting unsoundness w/ this check.)
10521052
(Activation(_, activating), _) if activating == borrow_index => {
10531053
debug!(
10541054
"check_access_for_conflict place_span: {:?} sd: {:?} rw: {:?} \
@@ -1107,7 +1107,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
11071107
);
11081108
// rust-lang/rust#56254 - This was previously permitted on
11091109
// the 2018 edition so we emit it as a warning. We buffer
1110-
// these sepately so that we only emit a warning if borrow
1110+
// these separately so that we only emit a warning if borrow
11111111
// checking was otherwise successful.
11121112
this.reservation_warnings
11131113
.insert(bi, (place_span.0, place_span.1, location, bk, borrow.clone()));
@@ -1588,7 +1588,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
15881588
) {
15891589
debug!("check_if_reassignment_to_immutable_state({:?})", local);
15901590

1591-
// Check if any of the initializiations of `local` have happened yet:
1591+
// Check if any of the initializations of `local` have happened yet:
15921592
if let Some(init_index) = self.is_local_ever_initialized(local, flow_state) {
15931593
// And, if so, report an error.
15941594
let init = &self.move_data.inits[init_index];

compiler/rustc_borrowck/src/region_infer/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
789789
let universe_a = self.scc_universes[scc_a];
790790

791791
// Quick check: if scc_b's declared universe is a subset of
792-
// scc_a's declared univese (typically, both are ROOT), then
792+
// scc_a's declared universe (typically, both are ROOT), then
793793
// it cannot contain any problematic universe elements.
794794
if universe_a.can_name(self.scc_universes[scc_b]) {
795795
return true;
@@ -1993,7 +1993,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
19931993
.iter()
19941994
.find_map(|constraint| {
19951995
if let ConstraintCategory::Predicate(predicate_span) = constraint.category {
1996-
// We currentl'y doesn't store the `DefId` in the `ConstraintCategory`
1996+
// We currently do not store the `DefId` in the `ConstraintCategory`
19971997
// for performances reasons. The error reporting code used by NLL only
19981998
// uses the span, so this doesn't cause any problems at the moment.
19991999
Some(ObligationCauseCode::BindingObligation(

compiler/rustc_borrowck/src/type_check/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2507,7 +2507,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
25072507
// we have to solve them here where we instantiate the
25082508
// closure.
25092509
//
2510-
// Despite the opacity of the previous parapgrah, this is
2510+
// Despite the opacity of the previous paragraph, this is
25112511
// actually relatively easy to understand in terms of the
25122512
// desugaring. A closure gets desugared to a struct, and
25132513
// these extra requirements are basically like where

0 commit comments

Comments
 (0)