diff options
| author | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2020-04-17 21:55:17 +0300 |
|---|---|---|
| committer | mark <markm@cs.wisc.edu> | 2020-04-24 13:44:07 -0500 |
| commit | 95b3c427d4cf740ebb3602c04dc5717aeb2ea4ee (patch) | |
| tree | ad677eab8a90049dcde01b6d27f41bd6ec84d525 /src/librustc_mir/transform | |
| parent | d1db782dffc085cc24a9024b31d6b83862b02d8a (diff) | |
| download | rust-95b3c427d4cf740ebb3602c04dc5717aeb2ea4ee.tar.gz rust-95b3c427d4cf740ebb3602c04dc5717aeb2ea4ee.zip | |
Remove `Option` from the return type of `def_kind`.
Diffstat (limited to 'src/librustc_mir/transform')
| -rw-r--r-- | src/librustc_mir/transform/const_prop.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/librustc_mir/transform/const_prop.rs b/src/librustc_mir/transform/const_prop.rs index 205bfcd7b37..4493ae2fef3 100644 --- a/src/librustc_mir/transform/const_prop.rs +++ b/src/librustc_mir/transform/const_prop.rs @@ -69,10 +69,7 @@ impl<'tcx> MirPass<'tcx> for ConstProp { let hir_id = tcx.hir().as_local_hir_id(source.def_id().expect_local()); let is_fn_like = FnLikeNode::from_node(tcx.hir().get(hir_id)).is_some(); - let is_assoc_const = match tcx.def_kind(source.def_id()) { - Some(DefKind::AssocConst) => true, - _ => false, - }; + let is_assoc_const = tcx.def_kind(source.def_id()) == DefKind::AssocConst; // Only run const prop on functions, methods, closures and associated constants if !is_fn_like && !is_assoc_const { |