1
Fork 0

Rollup merge of #95460 - nyurik:spelling-str, r=lcnr

Spellchecking compiler code

Address some spelling mistakes in strings, private function names, and function params.
This commit is contained in:
Dylan DPC 2022-03-30 09:10:06 +02:00 committed by GitHub
commit a629b2ac68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 10 additions and 10 deletions

View file

@ -624,7 +624,7 @@ impl<'a> AstValidator<'a> {
/// Reject C-varadic type unless the function is foreign, /// Reject C-varadic type unless the function is foreign,
/// or free and `unsafe extern "C"` semantically. /// or free and `unsafe extern "C"` semantically.
fn check_c_varadic_type(&self, fk: FnKind<'a>) { fn check_c_variadic_type(&self, fk: FnKind<'a>) {
match (fk.ctxt(), fk.header()) { match (fk.ctxt(), fk.header()) {
(Some(FnCtxt::Foreign), _) => return, (Some(FnCtxt::Foreign), _) => return,
(Some(FnCtxt::Free), Some(header)) => match header.ext { (Some(FnCtxt::Free), Some(header)) => match header.ext {
@ -1504,7 +1504,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
}; };
self.check_fn_decl(fk.decl(), self_semantic); self.check_fn_decl(fk.decl(), self_semantic);
self.check_c_varadic_type(fk); self.check_c_variadic_type(fk);
// Functions cannot both be `const async` // Functions cannot both be `const async`
if let Some(FnHeader { if let Some(FnHeader {

View file

@ -407,10 +407,10 @@ impl<'tcx> rustc_mir_dataflow::GenKillAnalysis<'tcx> for Borrows<'_, 'tcx> {
fn terminator_effect( fn terminator_effect(
&self, &self,
trans: &mut impl GenKill<Self::Idx>, trans: &mut impl GenKill<Self::Idx>,
teminator: &mir::Terminator<'tcx>, terminator: &mir::Terminator<'tcx>,
_location: Location, _location: Location,
) { ) {
if let mir::TerminatorKind::InlineAsm { operands, .. } = &teminator.kind { if let mir::TerminatorKind::InlineAsm { operands, .. } = &terminator.kind {
for op in operands { for op in operands {
if let mir::InlineAsmOperand::Out { place: Some(place), .. } if let mir::InlineAsmOperand::Out { place: Some(place), .. }
| mir::InlineAsmOperand::InOut { out_place: Some(place), .. } = *op | mir::InlineAsmOperand::InOut { out_place: Some(place), .. } = *op

View file

@ -11,7 +11,7 @@ case $1 in
sed -i "s/\"nightly-.*\"/\"nightly-${TOOLCHAIN}\"/" rust-toolchain sed -i "s/\"nightly-.*\"/\"nightly-${TOOLCHAIN}\"/" rust-toolchain
rustup component add rustfmt || true rustup component add rustfmt || true
echo "=> Uninstalling all old nighlies" echo "=> Uninstalling all old nightlies"
for nightly in $(rustup toolchain list | grep nightly | grep -v "$TOOLCHAIN" | grep -v nightly-x86_64); do for nightly in $(rustup toolchain list | grep nightly | grep -v "$TOOLCHAIN" | grep -v nightly-x86_64); do
rustup toolchain uninstall "$nightly" rustup toolchain uninstall "$nightly"
done done

View file

@ -10,7 +10,7 @@ case $1 in
rustup toolchain install --profile minimal nightly-${TOOLCHAIN} # Sanity check to see if the nightly exists rustup toolchain install --profile minimal nightly-${TOOLCHAIN} # Sanity check to see if the nightly exists
echo nightly-${TOOLCHAIN} > rust-toolchain echo nightly-${TOOLCHAIN} > rust-toolchain
echo "=> Uninstalling all old nighlies" echo "=> Uninstalling all old nightlies"
for nightly in $(rustup toolchain list | grep nightly | grep -v $TOOLCHAIN | grep -v nightly-x86_64); do for nightly in $(rustup toolchain list | grep nightly | grep -v $TOOLCHAIN | grep -v nightly-x86_64); do
rustup toolchain uninstall $nightly rustup toolchain uninstall $nightly
done done

View file

@ -356,7 +356,7 @@ fn build_union_fields_for_direct_tag_generator<'ll, 'tcx>(
generator_type_di_node: &'ll DIType, generator_type_di_node: &'ll DIType,
) -> SmallVec<&'ll DIType> { ) -> SmallVec<&'ll DIType> {
let Variants::Multiple { tag_encoding: TagEncoding::Direct, tag_field, .. } = generator_type_and_layout.variants else { let Variants::Multiple { tag_encoding: TagEncoding::Direct, tag_field, .. } = generator_type_and_layout.variants else {
bug!("This function only supports layouts with direcly encoded tags.") bug!("This function only supports layouts with directly encoded tags.")
}; };
let (generator_def_id, generator_substs) = match generator_type_and_layout.ty.kind() { let (generator_def_id, generator_substs) = match generator_type_and_layout.ty.kind() {

View file

@ -56,7 +56,7 @@ impl DefPathTable {
// //
// See the documentation for DefPathHash for more information. // See the documentation for DefPathHash for more information.
panic!( panic!(
"found DefPathHash collsion between {:?} and {:?}. \ "found DefPathHash collision between {:?} and {:?}. \
Compilation cannot continue.", Compilation cannot continue.",
def_path1, def_path2 def_path1, def_path2
); );

View file

@ -171,7 +171,7 @@ impl<Tag> Allocation<Tag> {
panic!("Allocation::uninit called with panic_on_fail had allocation failure") panic!("Allocation::uninit called with panic_on_fail had allocation failure")
} }
ty::tls::with(|tcx| { ty::tls::with(|tcx| {
tcx.sess.delay_span_bug(DUMMY_SP, "exhausted memory during interpreation") tcx.sess.delay_span_bug(DUMMY_SP, "exhausted memory during interpretation")
}); });
InterpError::ResourceExhaustion(ResourceExhaustionInfo::MemoryExhausted) InterpError::ResourceExhaustion(ResourceExhaustionInfo::MemoryExhausted)
})?; })?;

View file

@ -683,7 +683,7 @@ impl<'tcx> AutoTraitFinder<'tcx> {
&& is_new_pred && is_new_pred
{ {
debug!( debug!(
"evaluate_nested_obligations: adding projection predicate\ "evaluate_nested_obligations: adding projection predicate \
to computed_preds: {:?}", to computed_preds: {:?}",
predicate predicate
); );