diff options
| author | bors <bors@rust-lang.org> | 2021-11-06 22:55:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-11-06 22:55:37 +0000 |
| commit | 089a016919b0a9daaed9f676804102d6ba3f8f9d (patch) | |
| tree | f46a71dfffab593de738042085740e615520c0a0 /compiler/rustc_const_eval/src/const_eval | |
| parent | 0727994435c75fdedd3e9d226cf434089b0ab585 (diff) | |
| parent | ec471de865b6f93f384d1903cc53c39a6057a8aa (diff) | |
| download | rust-089a016919b0a9daaed9f676804102d6ba3f8f9d.tar.gz rust-089a016919b0a9daaed9f676804102d6ba3f8f9d.zip | |
Auto merge of #90661 - matthiaskrgr:rollup-1umbdlx, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #90487 (Add a chapter on reading Rustdoc output) - #90508 (Apply adjustments for field expression even if inaccessible) - #90627 (Suggest dereference of `Box` when inner type is expected) - #90642 (use matches!() macro in more places) - #90646 (type error go brrrrrrrr) - #90649 (Run reveal_all on MIR when inlining is activated.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_const_eval/src/const_eval')
| -rw-r--r-- | compiler/rustc_const_eval/src/const_eval/error.rs | 5 | ||||
| -rw-r--r-- | compiler/rustc_const_eval/src/const_eval/fn_queries.rs | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/compiler/rustc_const_eval/src/const_eval/error.rs b/compiler/rustc_const_eval/src/const_eval/error.rs index 5da16816625..87298023980 100644 --- a/compiler/rustc_const_eval/src/const_eval/error.rs +++ b/compiler/rustc_const_eval/src/const_eval/error.rs @@ -25,10 +25,7 @@ pub enum ConstEvalErrKind { impl MachineStopType for ConstEvalErrKind { fn is_hard_err(&self) -> bool { - match self { - Self::Panic { .. } => true, - _ => false, - } + matches!(self, Self::Panic { .. }) } } diff --git a/compiler/rustc_const_eval/src/const_eval/fn_queries.rs b/compiler/rustc_const_eval/src/const_eval/fn_queries.rs index 80551518d3c..821b048eb9b 100644 --- a/compiler/rustc_const_eval/src/const_eval/fn_queries.rs +++ b/compiler/rustc_const_eval/src/const_eval/fn_queries.rs @@ -51,10 +51,8 @@ fn is_const_fn_raw(tcx: TyCtxt<'_>, def_id: DefId) -> bool { // If the function itself is not annotated with `const`, it may still be a `const fn` // if it resides in a const trait impl. is_parent_const_impl_raw(tcx, hir_id) - } else if let hir::Node::Ctor(_) = node { - true } else { - false + matches!(node, hir::Node::Ctor(_)) } } |
