Add new folder for destructuring assignment tests

rust-lang · Dec 22, 2019 · 770725c · 770725c
1 parent ddd4500
commit 770725c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs
@@ -1659,6 +1659,7 @@ pub enum ExprKind {
     Block(P<Block>, Option<Label>),
 
     /// An assignment (e.g., `a = foo()`).
+    /// The `Span` argument is the span of the `=` token.
     Assign(P<Expr>, P<Expr>, Span),
     /// An assignment with an operator.
     ///

diff --git a/src/librustc_typeck/check/expr.rs b/src/librustc_typeck/check/expr.rs
@@ -788,7 +788,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             );
             err.span_label(lhs.span, "cannot assign to this expression");
             if self.is_destructuring_place_expr(lhs) {
-                err.note("destructuring assignments are not yet supported");
+                err.note("destructuring assignments are not currently supported");
                 err.note(
                     "for more information, see https://github.com/rust-lang/rfcs/issues/372",
                 );

diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
@@ -1228,6 +1228,7 @@ pub enum ExprKind {
     TryBlock(P<Block>),
 
     /// An assignment (`a = foo()`).
+    /// The `Span` argument is the span of the `=` token.
     Assign(P<Expr>, P<Expr>, Span),
     /// An assignment with an operator.
     ///

diff --git a/src/test/ui/bad/bad-expr-lhs.stderr b/src/test/ui/bad/bad-expr-lhs.stderr
@@ -30,7 +30,7 @@ LL |     (a, b) = (3, 4);
    |     |
    |     cannot assign to this expression
    |
-   = note: destructuring assignments are not yet supported
+   = note: destructuring assignments are not currently supported
    = note: for more information, see https://github.com/rust-lang/rfcs/issues/372
 
 error[E0070]: invalid left-hand side of assignment

diff --git a/src/test/ui/bad/destructuring-assignment.rs → ...tructuring-assignment/note-unsupported.rs b/src/test/ui/bad/destructuring-assignment.rs → ...tructuring-assignment/note-unsupported.rs
diff --git a/...st/ui/bad/destructuring-assignment.stderr → ...turing-assignment/note-unsupported.stderr b/...st/ui/bad/destructuring-assignment.stderr → ...turing-assignment/note-unsupported.stderr
@@ -6,7 +6,7 @@ LL |     (a, b) = (3, 4);
    |     |
    |     cannot assign to this expression
    |
-   = note: destructuring assignments are not yet supported
+   = note: destructuring assignments are not currently supported
    = note: for more information, see https://github.com/rust-lang/rfcs/issues/372
 
 error[E0368]: binary assignment operation `+=` cannot be applied to type `({integer}, {integer})`
@@ -27,7 +27,7 @@ LL |     (a, b) += (3, 4);
    |     |
    |     cannot assign to this expression
    |
-   = note: destructuring assignments are not yet supported
+   = note: destructuring assignments are not currently supported
    = note: for more information, see https://github.com/rust-lang/rfcs/issues/372
 
 error[E0070]: invalid left-hand side of assignment
@@ -38,7 +38,7 @@ LL |     [a, b] = [3, 4];
    |     |
    |     cannot assign to this expression
    |
-   = note: destructuring assignments are not yet supported
+   = note: destructuring assignments are not currently supported
    = note: for more information, see https://github.com/rust-lang/rfcs/issues/372
 
 error[E0368]: binary assignment operation `+=` cannot be applied to type `[{integer}; 2]`
@@ -59,7 +59,7 @@ LL |     [a, b] += [3, 4];
    |     |
    |     cannot assign to this expression
    |
-   = note: destructuring assignments are not yet supported
+   = note: destructuring assignments are not currently supported
    = note: for more information, see https://github.com/rust-lang/rfcs/issues/372
 
 error[E0070]: invalid left-hand side of assignment
@@ -70,7 +70,7 @@ LL |     S { x: a, y: b } = s;
    |     |
    |     cannot assign to this expression
    |
-   = note: destructuring assignments are not yet supported
+   = note: destructuring assignments are not currently supported
    = note: for more information, see https://github.com/rust-lang/rfcs/issues/372
 
 error[E0368]: binary assignment operation `+=` cannot be applied to type `S`
@@ -91,7 +91,7 @@ LL |     S { x: a, y: b } += s;
    |     |
    |     cannot assign to this expression
    |
-   = note: destructuring assignments are not yet supported
+   = note: destructuring assignments are not currently supported
    = note: for more information, see https://github.com/rust-lang/rfcs/issues/372
 
 error[E0070]: invalid left-hand side of assignment
@@ -102,7 +102,7 @@ LL |     S { x: a, ..s } = S { x: 3, y: 4 };
    |     |
    |     cannot assign to this expression
    |
-   = note: destructuring assignments are not yet supported
+   = note: destructuring assignments are not currently supported
    = note: for more information, see https://github.com/rust-lang/rfcs/issues/372
 
 error[E0070]: invalid left-hand side of assignment
@@ -113,7 +113,7 @@ LL |     ((a, b), c) = ((3, 4), 5);
    |     |
    |     cannot assign to this expression
    |
-   = note: destructuring assignments are not yet supported
+   = note: destructuring assignments are not currently supported
    = note: for more information, see https://github.com/rust-lang/rfcs/issues/372
 
 error: aborting due to 11 previous errors