about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Woerister <michaelwoerister@posteo.net>2017-03-21 10:42:51 +0100
committerMichael Woerister <michaelwoerister@posteo.net>2017-03-22 09:14:24 +0100
commit45deab4a2c5d0674cac0fd260da4b8c0d46f7aa2 (patch)
treeb4f3976e3e6320675d80bf99e3605f70e64a5a31
parent03b8091d103873386688f171fc48fbe0a8618810 (diff)
downloadrust-45deab4a2c5d0674cac0fd260da4b8c0d46f7aa2.tar.gz
rust-45deab4a2c5d0674cac0fd260da4b8c0d46f7aa2.zip
Address review comments.
-rw-r--r--src/librustc/ty/util.rs4
-rw-r--r--src/librustc_mir/transform/erase_regions.rs13
2 files changed, 14 insertions, 3 deletions
diff --git a/src/librustc/ty/util.rs b/src/librustc/ty/util.rs
index 03db15263b6..1c1e0d91cb4 100644
--- a/src/librustc/ty/util.rs
+++ b/src/librustc/ty/util.rs
@@ -513,7 +513,9 @@ impl<'a, 'gcx, 'tcx, W> TypeVisitor<'tcx> for TypeIdHasher<'a, 'gcx, 'tcx, W>
         match *r {
             ty::ReErased |
             ty::ReStatic |
-            ty::ReEmpty => {}
+            ty::ReEmpty => {
+                // No variant fields to hash for these ...
+            }
             ty::ReLateBound(db, ty::BrAnon(i)) => {
                 self.hash(db.depth);
                 self.hash(i);
diff --git a/src/librustc_mir/transform/erase_regions.rs b/src/librustc_mir/transform/erase_regions.rs
index 07822a5a097..0f869e7ed02 100644
--- a/src/librustc_mir/transform/erase_regions.rs
+++ b/src/librustc_mir/transform/erase_regions.rs
@@ -45,8 +45,17 @@ impl<'a, 'tcx> MutVisitor<'tcx> for EraseRegionsVisitor<'a, 'tcx> {
             Rvalue::Ref(ref mut r, _, _) => {
                 *r = self.tcx.mk_region(ReErased);
             }
-            _ => {
-                /* only the above variant contains regions */
+            Rvalue::Use(..) |
+            Rvalue::Repeat(..) |
+            Rvalue::Len(..) |
+            Rvalue::Cast(..) |
+            Rvalue::BinaryOp(..) |
+            Rvalue::CheckedBinaryOp(..) |
+            Rvalue::UnaryOp(..) |
+            Rvalue::Discriminant(..) |
+            Rvalue::Box(..) |
+            Rvalue::Aggregate(..) => {
+                // These variants don't contain regions.
             }
         }
         self.super_rvalue(rvalue, location);