]> git.lizzy.rs Git - rust.git/commitdiff
Make the `next` variable mutable to allow for ref mut in for patterns.
authorJohn Kåre Alsaker <john.kare.alsaker@gmail.com>
Fri, 16 Jun 2017 23:51:55 +0000 (01:51 +0200)
committerJohn Kåre Alsaker <john.kare.alsaker@gmail.com>
Fri, 16 Jun 2017 23:51:55 +0000 (01:51 +0200)
src/librustc/hir/lowering.rs
src/test/run-pass/for-loop-mut-ref-element.rs [new file with mode: 0644]

index f2a434979535d361022c387b225dd0aaa8645f30..4b8ee8d8aecfb707b92e40062a7e56fb79adc7da 100644 (file)
@@ -2170,12 +2170,12 @@ fn lower_expr(&mut self, e: &Expr) -> hir::Expr {
                 //     let result = match ::std::iter::IntoIterator::into_iter(<head>) {
                 //       mut iter => {
                 //         [opt_ident]: loop {
-                //           let next;
+                //           let mut _next;
                 //           match ::std::iter::Iterator::next(&mut iter) {
-                //             ::std::option::Option::Some(val) => next = val,
+                //             ::std::option::Option::Some(val) => _next = val,
                 //             ::std::option::Option::None => break
                 //           };
-                //           let <pat> = next;
+                //           let <pat> = _next;
                 //           StmtExpr(<body>);
                 //         }
                 //       }
@@ -2188,8 +2188,8 @@ fn lower_expr(&mut self, e: &Expr) -> hir::Expr {
 
                 let iter = self.str_to_ident("iter");
 
-                let next_ident = self.str_to_ident("next");
-                let next_pat = self.pat_ident(e.span, next_ident);
+                let next_ident = self.str_to_ident("_next");
+                let next_pat = self.pat_ident_binding_mode(e.span, next_ident, hir::BindByValue(hir::MutMutable));
 
                 // `::std::option::Option::Some(val) => next = val`
                 let pat_arm = {
@@ -2235,13 +2235,13 @@ fn lower_expr(&mut self, e: &Expr) -> hir::Expr {
 
                 let next_expr = P(self.expr_ident(e.span, next_ident, next_pat.id));
 
-                // `let next`
+                // `let mut _next`
                 let next_let = self.stmt_let_pat(e.span,
                     None,
                     next_pat,
                     hir::LocalSource::ForLoopDesugar);
 
-                // `let <pat> = next`
+                // `let <pat> = _next`
                 let pat = self.lower_pat(pat);
                 let pat_let = self.stmt_let_pat(e.span,
                     Some(next_expr),
diff --git a/src/test/run-pass/for-loop-mut-ref-element.rs b/src/test/run-pass/for-loop-mut-ref-element.rs
new file mode 100644 (file)
index 0000000..14ce23b
--- /dev/null
@@ -0,0 +1,15 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Tests that for loops can bind elements as mutable references
+
+fn main() {
+    for ref mut _a in std::iter::once(true) {}
+}
\ No newline at end of file