Skip to content

Commit ffaf6f0

Browse files
committedMar 31, 2022
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

+1-1
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

+1-1
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
},

0 commit comments

Comments
 (0)