Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit cd11905

Browse files
committedMar 18, 2022
Auto merge of #95056 - Dylan-DPC:rollup-swtuw2n, r=Dylan-DPC
Rollup of 10 pull requests Successful merges: - #91133 (Improve `unsafe` diagnostic) - #93222 (Make ErrorReported impossible to construct outside `rustc_errors`) - #93745 (Stabilize ADX target feature) - #94309 ([generator_interior] Be more precise with scopes of borrowed places) - #94698 (Remove redundant code from copy-suggestions) - #94731 (Suggest adding `{ .. }` around a const function call with arguments) - #94960 (Fix many spelling mistakes) - #94982 (Add deprecated_safe feature gate and attribute, cc #94978) - #94997 (debuginfo: Fix ICE when generating name for type that produces a layout error.) - #95000 (Fixed wrong type name in comment) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4ca56d2 + 4493826 commit cd11905

File tree

181 files changed

+1290
-773
lines changed

Some content is hidden

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

181 files changed

+1290
-773
lines changed
 

‎compiler/rustc_ast_lowering/src/item.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub(super) struct ItemLowerer<'a, 'lowering, 'hir> {
2626
}
2727

2828
/// When we have a ty alias we *may* have two where clauses. To give the best diagnostics, we set the span
29-
/// to the where clause that is prefered, if it exists. Otherwise, it sets the span to the other where
29+
/// to the where clause that is preferred, if it exists. Otherwise, it sets the span to the other where
3030
/// clause if it exists.
3131
fn add_ty_alias_where_clause(
3232
generics: &mut ast::Generics,

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
952952
sess.diagnostic().delay_span_bug(
953953
span,
954954
"unexpected delimiter in key-value attribute's value",
955-
)
955+
);
956956
}
957957
unwrap_single_token(sess, tokens, span)
958958
}

0 commit comments

Comments
 (0)
Please sign in to comment.