add FIXME related to ref x bindings

rust-lang · Sep 10, 2018 · df37678 · df37678
1 parent 2b6f966
commit df37678
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/src/librustc_mir/build/matches/mod.rs b/src/librustc_mir/build/matches/mod.rs
@@ -475,7 +475,7 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
     pub fn visit_bindings(
         &mut self,
         pattern: &Pattern<'tcx>,
-        pattern_user_ty: Option<CanonicalTy<'tcx>>,
+        mut pattern_user_ty: Option<CanonicalTy<'tcx>>,
         f: &mut impl FnMut(
             &mut Self,
             Mutability,
@@ -497,6 +497,19 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
                 ref subpattern,
                 ..
             } => {
+                match mode {
+                    BindingMode::ByValue => { }
+                    BindingMode::ByRef(..) => {
+                        // If this is a `ref` binding (e.g., `let ref
+                        // x: T = ..`), then the type of `x` is not
+                        // `T` but rather `&T`, so ignore
+                        // `pattern_user_ty` for now.
+                        //
+                        // FIXME(#47184): extract or handle `pattern_user_ty` somehow
+                        pattern_user_ty = None;
+                    }
+                }
+
                 f(self, mutability, name, mode, var, pattern.span, ty, pattern_user_ty);
                 if let Some(subpattern) = subpattern.as_ref() {
                     self.visit_bindings(subpattern, pattern_user_ty, f);

diff --git a/src/test/ui/nll/user-annotations/patterns.rs b/src/test/ui/nll/user-annotations/patterns.rs
@@ -20,7 +20,7 @@ fn ref_with_ascribed_static_type() -> u32 {
     // Check the behavior in some wacky cases.
     let x = 22;
     let y = &x; //~ ERROR
-    let ref z: &'static u32 = y; //~ ERROR
+    let ref z: &'static u32 = y;
     **z
 }
 

diff --git a/src/test/ui/nll/user-annotations/patterns.stderr b/src/test/ui/nll/user-annotations/patterns.stderr
@@ -19,17 +19,6 @@ LL | }
    |
    = note: borrowed value must be valid for the static lifetime...
 
-error[E0597]: `y` does not live long enough
-  --> $DIR/patterns.rs:23:9
-   |
-LL |     let ref z: &'static u32 = y; //~ ERROR
-   |         ^^^^^ borrowed value does not live long enough
-LL |     **z
-LL | }
-   | - `y` dropped here while still borrowed
-   |
-   = note: borrowed value must be valid for the static lifetime...
-
 error[E0597]: `x` does not live long enough
   --> $DIR/patterns.rs:46:27
    |
@@ -149,6 +138,6 @@ LL | fn a_to_static_then_static<'a>(x: &'a u32) -> &'static u32 {
 LL |     let (y, _z): (&'static u32, u32) = (x, 44); //~ ERROR
    |                                        ^^^^^^^ requires that `'a` must outlive `'static`
 
-error: aborting due to 15 previous errors
+error: aborting due to 14 previous errors
 
 For more information about this error, try `rustc --explain E0597`.