Skip to content

Commit edefa41

Browse files
committedJan 17, 2023
Auto merge of rust-lang#106998 - matthiaskrgr:rollup-hmfisji, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#104505 (Remove double spaces after dots in comments) - rust-lang#106784 (prevent E0512 from emitting [type error] by checking the references_error) - rust-lang#106834 (new trait solver: only consider goal changed if response is not identity) - rust-lang#106889 (Mention the lack of `windows_mut` in `windows`) - rust-lang#106963 (Use `scope_expr_id` from `ProbeCtxt`) - rust-lang#106970 (Switch to `EarlyBinder` for `item_bounds` query) - rust-lang#106980 (Hide `_use_mk_alias_ty_instead` in `<AliasTy as Debug>::fmt`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3984bc5 + 48bd3ab commit edefa41

File tree

173 files changed

+412
-366
lines changed

Some content is hidden

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

173 files changed

+412
-366
lines changed
 

‎compiler/rustc_abi/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,8 +1263,8 @@ pub enum Variants<V: Idx> {
12631263

12641264
/// Enum-likes with more than one inhabited variant: each variant comes with
12651265
/// a *discriminant* (usually the same as the variant index but the user can
1266-
/// assign explicit discriminant values). That discriminant is encoded
1267-
/// as a *tag* on the machine. The layout of each variant is
1266+
/// assign explicit discriminant values). That discriminant is encoded
1267+
/// as a *tag* on the machine. The layout of each variant is
12681268
/// a struct, and they all have space reserved for the tag.
12691269
/// For enums, the tag is the sole field of the layout.
12701270
Multiple {

‎compiler/rustc_ast/src/util/parser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ impl ExprPrecedence {
304304
| ExprPrecedence::Yeet => PREC_JUMP,
305305

306306
// `Range` claims to have higher precedence than `Assign`, but `x .. x = x` fails to
307-
// parse, instead of parsing as `(x .. x) = x`. Giving `Range` a lower precedence
307+
// parse, instead of parsing as `(x .. x) = x`. Giving `Range` a lower precedence
308308
// ensures that `pprust` will add parentheses in the right places to get the desired
309309
// parse.
310310
ExprPrecedence::Range => PREC_RANGE,

0 commit comments

Comments
 (0)