Skip to content

Commit f7534b5

Browse files
committedFeb 10, 2021
Auto merge of rust-lang#81952 - JohnTitor:rollup-i28kgfb, r=JohnTitor
Rollup of 11 pull requests Successful merges: - rust-lang#79849 (Clarify docs regarding sleep of zero duration) - rust-lang#80438 (Add `Box::into_inner`.) - rust-lang#81466 (Add suggest mut method for loop) - rust-lang#81687 (Make Vec::split_at_spare_mut public) - rust-lang#81904 (Bump stabilization version for const int methods) - rust-lang#81909 ([compiler/rustc_typeck/src/check/expr.rs] Remove unnecessary refs in pattern matching) - rust-lang#81910 (Use format string in bootstrap panic instead of a string directly) - rust-lang#81913 (Rename HIR UnOp variants) - rust-lang#81925 (Add long explanation for E0547) - rust-lang#81926 (add suggestion to use the `async_recursion` crate) - rust-lang#81951 (Update cargo) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents ca98712 + 77114af commit f7534b5

Some content is hidden

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

58 files changed

+387
-160
lines changed
 

‎compiler/rustc_ast_lowering/src/expr.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,9 @@ impl<'hir> LoweringContext<'_, 'hir> {
260260

261261
fn lower_unop(&mut self, u: UnOp) -> hir::UnOp {
262262
match u {
263-
UnOp::Deref => hir::UnOp::UnDeref,
264-
UnOp::Not => hir::UnOp::UnNot,
265-
UnOp::Neg => hir::UnOp::UnNeg,
263+
UnOp::Deref => hir::UnOp::Deref,
264+
UnOp::Not => hir::UnOp::Not,
265+
UnOp::Neg => hir::UnOp::Neg,
266266
}
267267
}
268268

‎compiler/rustc_error_codes/src/error_codes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ E0539: include_str!("./error_codes/E0539.md"),
287287
E0541: include_str!("./error_codes/E0541.md"),
288288
E0542: include_str!("./error_codes/E0542.md"),
289289
E0546: include_str!("./error_codes/E0546.md"),
290+
E0547: include_str!("./error_codes/E0547.md"),
290291
E0550: include_str!("./error_codes/E0550.md"),
291292
E0551: include_str!("./error_codes/E0551.md"),
292293
E0552: include_str!("./error_codes/E0552.md"),
@@ -606,7 +607,6 @@ E0781: include_str!("./error_codes/E0781.md"),
606607
E0543, // missing 'reason'
607608
E0544, // multiple stability levels
608609
E0545, // incorrect 'issue'
609-
E0547, // missing 'issue'
610610
// E0548, // replaced with a generic attribute input check
611611
// rustc_deprecated attribute must be paired with either stable or unstable
612612
// attribute

0 commit comments

Comments
 (0)