about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCamille GILLOT <gillot.camille@gmail.com>2019-11-09 11:43:32 +0100
committerCamille GILLOT <gillot.camille@gmail.com>2019-11-12 20:50:47 +0100
commit4caa66f25ded7ae6fbd062332f3642b93a2d40a8 (patch)
treedd7a11fbb582ae8ef9a06a3e69c6b31672e45376
parent6b56dced4c4fa1ac9d6d7629c816ad9b06c466d0 (diff)
downloadrust-4caa66f25ded7ae6fbd062332f3642b93a2d40a8.tar.gz
rust-4caa66f25ded7ae6fbd062332f3642b93a2d40a8.zip
Centril review.
-rw-r--r--src/librustc/ty/relate.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/librustc/ty/relate.rs b/src/librustc/ty/relate.rs
index 49a25347912..28bd43b3ee5 100644
--- a/src/librustc/ty/relate.rs
+++ b/src/librustc/ty/relate.rs
@@ -605,10 +605,7 @@ pub fn super_relate_consts<R: TypeRelation<'tcx>>(
                 _ =>  Err(TypeError::ConstMismatch(expected_found(relation, &a, &b))),
             };
 
-            match new_val {
-                Ok(val) => Ok(ty::ConstKind::Value(val)),
-                Err(err) => Err(err),
-            }
+            new_val.map(ty::ConstKind::Value)
         },
 
         // FIXME(const_generics): this is wrong, as it is a projection