Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit ffaf6f0

Browse files
committed
Auto merge of rust-lang#95506 - Dylan-DPC:rollup-b6kxzjc, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - rust-lang#95130 (Stabilize thread::is_finished) - rust-lang#95263 (Restore `impl Future<Output = Type>` to async blocks) - rust-lang#95471 (Don't ICE when opaque types get their hidden type constrained again.) - rust-lang#95491 (Stabilize feature vec_retain_mut on Vec and VecDeque) - rust-lang#95497 (Spellchecking compiler comments) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents a39ac5a + 1b7d6db commit ffaf6f0

File tree

128 files changed

+233
-208
lines changed

Some content is hidden

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

128 files changed

+233
-208
lines changed

compiler/rustc_ast/src/tokenstream.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ impl AttrAnnotatedTokenStream {
295295
///
296296
/// For example, `#[cfg(FALSE)] struct Foo {}` would
297297
/// have an `attrs` field containing the `#[cfg(FALSE)]` attr,
298-
/// and a `tokens` field storing the (unparesd) tokens `struct Foo {}`
298+
/// and a `tokens` field storing the (unparsed) tokens `struct Foo {}`
299299
#[derive(Clone, Debug, Encodable, Decodable)]
300300
pub struct AttributesData {
301301
/// Attributes, both outer and inner.

compiler/rustc_borrowck/src/type_check/relate_tys.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ impl<'tcx> TypeRelatingDelegate<'tcx> for NllTypeRelatingDelegate<'_, '_, 'tcx>
158158
.infcx
159159
.handle_opaque_type(a, b, a_is_expected, &cause, param_env)?
160160
.obligations,
161-
// These fields are filled in during exectuion of the operation
161+
// These fields are filled in during execution of the operation
162162
base_universe: None,
163163
region_constraints: None,
164164
},

compiler/rustc_codegen_ssa/src/back/write.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ pub fn compute_per_cgu_lto_type(
779779
// we'll encounter later.
780780
let is_allocator = module_kind == ModuleKind::Allocator;
781781

782-
// We ignore a request for full crate grath LTO if the cate type
782+
// We ignore a request for full crate graph LTO if the crate type
783783
// is only an rlib, as there is no full crate graph to process,
784784
// that'll happen later.
785785
//

compiler/rustc_expand/src/mbe/transcribe.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ enum Frame {
3535
impl Frame {
3636
/// Construct a new frame around the delimited set of tokens.
3737
fn new(mut tts: Vec<mbe::TokenTree>) -> Frame {
38-
// Need to add empty delimeters.
38+
// Need to add empty delimiters.
3939
let open_tt = mbe::TokenTree::token(token::OpenDelim(token::NoDelim), DUMMY_SP);
4040
let close_tt = mbe::TokenTree::token(token::CloseDelim(token::NoDelim), DUMMY_SP);
4141
tts.insert(0, open_tt);
@@ -210,7 +210,7 @@ pub(super) fn transcribe<'a>(
210210
));
211211
}
212212
} else {
213-
// 0 is the initial counter (we have done 0 repretitions so far). `len`
213+
// 0 is the initial counter (we have done 0 repetitions so far). `len`
214214
// is the total number of repetitions we should generate.
215215
repeats.push((0, len));
216216

compiler/rustc_index/src/bit_set.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1717,7 +1717,7 @@ impl<R: Idx, C: Idx> SparseBitMatrix<R, C> {
17171717
if let Some(Some(row)) = self.rows.get(row) { Some(row) } else { None }
17181718
}
17191719

1720-
/// Interescts `row` with `set`. `set` can be either `BitSet` or
1720+
/// Intersects `row` with `set`. `set` can be either `BitSet` or
17211721
/// `HybridBitSet`. Has no effect if `row` does not exist.
17221722
///
17231723
/// Returns true if the row was changed.

compiler/rustc_infer/src/infer/canonical/query_response.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//! in particular to extract out the resulting region obligations and
33
//! encode them therein.
44
//!
5-
//! For an overview of what canonicaliation is and how it fits into
5+
//! For an overview of what canonicalization is and how it fits into
66
//! rustc, check out the [chapter in the rustc dev guide][c].
77
//!
88
//! [c]: https://rust-lang.github.io/chalk/book/canonical_queries/canonicalization.html

compiler/rustc_infer/src/infer/error_reporting/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
11641164
let len = sub1.len() - common_default_params;
11651165
let consts_offset = len - sub1.consts().count();
11661166

1167-
// Only draw `<...>` if there're lifetime/type arguments.
1167+
// Only draw `<...>` if there are lifetime/type arguments.
11681168
if len > 0 {
11691169
values.0.push_normal("<");
11701170
values.1.push_normal("<");
@@ -1245,7 +1245,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
12451245
}
12461246

12471247
// Close the type argument bracket.
1248-
// Only draw `<...>` if there're lifetime/type arguments.
1248+
// Only draw `<...>` if there are lifetime/type arguments.
12491249
if len > 0 {
12501250
values.0.push_normal(">");
12511251
values.1.push_normal(">");
@@ -1857,7 +1857,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
18571857
})
18581858
.transpose();
18591859
if output.is_some() {
1860-
// We don't account for multiple `Future::Output = Ty` contraints.
1860+
// We don't account for multiple `Future::Output = Ty` constraints.
18611861
return output;
18621862
}
18631863
}

compiler/rustc_infer/src/infer/lattice.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ where
8383
// But if we did in reverse order, we would create a `v <:
8484
// LHS` (or vice versa) constraint and then instantiate
8585
// `v`. This would require further processing to achieve same
86-
// end-result; in partiular, this screws up some of the logic
86+
// end-result; in particular, this screws up some of the logic
8787
// in coercion, which expects LUB to figure out that the LHS
8888
// is (e.g.) `Box<i32>`. A more obvious solution might be to
8989
// iterate on the subtype obligations that are returned, but I

compiler/rustc_infer/src/infer/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ pub struct InferCtxt<'a, 'tcx> {
343343

344344
/// Track how many errors were reported when this infcx is created.
345345
/// If the number of errors increases, that's also a sign (line
346-
/// `tained_by_errors`) to avoid reporting certain kinds of errors.
346+
/// `tainted_by_errors`) to avoid reporting certain kinds of errors.
347347
// FIXME(matthewjasper) Merge into `tainted_by_errors_flag`
348348
err_count_on_creation: usize,
349349

compiler/rustc_infer/src/infer/nll_relate/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ where
550550
}
551551

552552
if a == b {
553-
// Subtle: if a or b has a bound variable that we are lazilly
553+
// Subtle: if a or b has a bound variable that we are lazily
554554
// substituting, then even if a == b, it could be that the values we
555555
// will substitute for those bound variables are *not* the same, and
556556
// hence returning `Ok(a)` is incorrect.

0 commit comments

Comments
 (0)