59 files changed, 9 insertions, 1 deletions
diff --git a/src/test/ui/expr-block-fn.rs b/tests/ui/expr-block-fn.rs
index 1cac2cac0..1cac2cac0 100644
--- a/src/test/ui/expr-block-fn.rs
+++ b/tests/ui/expr-block-fn.rs
diff --git a/src/test/ui/expr-block-generic-unique1.rs b/tests/ui/expr-block-generic-unique1.rs
index 14603a2c7..14603a2c7 100644
--- a/src/test/ui/expr-block-generic-unique1.rs
+++ b/tests/ui/expr-block-generic-unique1.rs
diff --git a/src/test/ui/expr-block-generic-unique2.rs b/tests/ui/expr-block-generic-unique2.rs
index 7879c144b..7879c144b 100644
--- a/src/test/ui/expr-block-generic-unique2.rs
+++ b/tests/ui/expr-block-generic-unique2.rs
diff --git a/src/test/ui/expr-block-generic.rs b/tests/ui/expr-block-generic.rs
index 29c7c4221..29c7c4221 100644
--- a/src/test/ui/expr-block-generic.rs
+++ b/tests/ui/expr-block-generic.rs
diff --git a/src/test/ui/expr-block.rs b/tests/ui/expr-block.rs
index ff87595c9..ff87595c9 100644
--- a/src/test/ui/expr-block.rs
+++ b/tests/ui/expr-block.rs
diff --git a/src/test/ui/expr-copy.rs b/tests/ui/expr-copy.rs
index 1c6ae0381..1c6ae0381 100644
--- a/src/test/ui/expr-copy.rs
+++ b/tests/ui/expr-copy.rs
diff --git a/src/test/ui/expr-if-generic.rs b/tests/ui/expr-if-generic.rs
index 32ed6d9be..32ed6d9be 100644
--- a/src/test/ui/expr-if-generic.rs
+++ b/tests/ui/expr-if-generic.rs
diff --git a/src/test/ui/expr-if-panic-all.rs b/tests/ui/expr-if-panic-all.rs
index f915a7d9d..f915a7d9d 100644
--- a/src/test/ui/expr-if-panic-all.rs
+++ b/tests/ui/expr-if-panic-all.rs
diff --git a/src/test/ui/expr-if-unique.rs b/tests/ui/expr-if-unique.rs
index 862326835..862326835 100644
--- a/src/test/ui/expr-if-unique.rs
+++ b/tests/ui/expr-if-unique.rs
diff --git a/src/test/ui/expr-scope.rs b/tests/ui/expr-scope.rs
index 9976b6814..9976b6814 100644
--- a/src/test/ui/expr-scope.rs
+++ b/tests/ui/expr-scope.rs
diff --git a/src/test/ui/expr/compound-assignment/eval-order.rs b/tests/ui/expr/compound-assignment/eval-order.rs
index 658adae19..658adae19 100644
--- a/src/test/ui/expr/compound-assignment/eval-order.rs
+++ b/tests/ui/expr/compound-assignment/eval-order.rs
diff --git a/src/test/ui/expr/if-bot.rs b/tests/ui/expr/if-bot.rs
index 0f09db530..0f09db530 100644
--- a/src/test/ui/expr/if-bot.rs
+++ b/tests/ui/expr/if-bot.rs
diff --git a/src/test/ui/expr/if/attrs/bad-cfg.rs b/tests/ui/expr/if/attrs/bad-cfg.rs
index 3f84929a0..3f84929a0 100644
--- a/src/test/ui/expr/if/attrs/bad-cfg.rs
+++ b/tests/ui/expr/if/attrs/bad-cfg.rs
diff --git a/src/test/ui/expr/if/attrs/bad-cfg.stderr b/tests/ui/expr/if/attrs/bad-cfg.stderr
index 8a2890886..8a2890886 100644
--- a/src/test/ui/expr/if/attrs/bad-cfg.stderr
+++ b/tests/ui/expr/if/attrs/bad-cfg.stderr
diff --git a/src/test/ui/expr/if/attrs/builtin-if-attr.rs b/tests/ui/expr/if/attrs/builtin-if-attr.rs
index 7e2906615..7e2906615 100644
--- a/src/test/ui/expr/if/attrs/builtin-if-attr.rs
+++ b/tests/ui/expr/if/attrs/builtin-if-attr.rs
diff --git a/src/test/ui/expr/if/attrs/cfg-false-if-attr.rs b/tests/ui/expr/if/attrs/cfg-false-if-attr.rs
index 1f77a1bb3..1f77a1bb3 100644
--- a/src/test/ui/expr/if/attrs/cfg-false-if-attr.rs
+++ b/tests/ui/expr/if/attrs/cfg-false-if-attr.rs
diff --git a/src/test/ui/expr/if/attrs/else-attrs.rs b/tests/ui/expr/if/attrs/else-attrs.rs
index 85da7cf6b..85da7cf6b 100644
--- a/src/test/ui/expr/if/attrs/else-attrs.rs
+++ b/tests/ui/expr/if/attrs/else-attrs.rs
diff --git a/src/test/ui/expr/if/attrs/else-attrs.stderr b/tests/ui/expr/if/attrs/else-attrs.stderr
index 273337705..273337705 100644
--- a/src/test/ui/expr/if/attrs/else-attrs.stderr
+++ b/tests/ui/expr/if/attrs/else-attrs.stderr
diff --git a/src/test/ui/expr/if/attrs/gate-whole-expr.rs b/tests/ui/expr/if/attrs/gate-whole-expr.rs
index 63772d54b..63772d54b 100644
--- a/src/test/ui/expr/if/attrs/gate-whole-expr.rs
+++ b/tests/ui/expr/if/attrs/gate-whole-expr.rs
diff --git a/src/test/ui/expr/if/attrs/let-chains-attr.rs b/tests/ui/expr/if/attrs/let-chains-attr.rs
index 2cd873114..2cd873114 100644
--- a/src/test/ui/expr/if/attrs/let-chains-attr.rs
+++ b/tests/ui/expr/if/attrs/let-chains-attr.rs
diff --git a/src/test/ui/expr/if/attrs/stmt-expr-gated.rs b/tests/ui/expr/if/attrs/stmt-expr-gated.rs
index 38599c8e6..38599c8e6 100644
--- a/src/test/ui/expr/if/attrs/stmt-expr-gated.rs
+++ b/tests/ui/expr/if/attrs/stmt-expr-gated.rs
diff --git a/src/test/ui/expr/if/attrs/stmt-expr-gated.stderr b/tests/ui/expr/if/attrs/stmt-expr-gated.stderr
index 47dac39a9..47dac39a9 100644
--- a/src/test/ui/expr/if/attrs/stmt-expr-gated.stderr
+++ b/tests/ui/expr/if/attrs/stmt-expr-gated.stderr
diff --git a/src/test/ui/expr/if/bad-if-let-suggestion.rs b/tests/ui/expr/if/bad-if-let-suggestion.rs
index a8b2a2830..a8b2a2830 100644
--- a/src/test/ui/expr/if/bad-if-let-suggestion.rs
+++ b/tests/ui/expr/if/bad-if-let-suggestion.rs
diff --git a/src/test/ui/expr/if/bad-if-let-suggestion.stderr b/tests/ui/expr/if/bad-if-let-suggestion.stderr
index 3a53a20b4..3a53a20b4 100644
--- a/src/test/ui/expr/if/bad-if-let-suggestion.stderr
+++ b/tests/ui/expr/if/bad-if-let-suggestion.stderr
diff --git a/src/test/ui/expr/if/expr-if-panic-fn.rs b/tests/ui/expr/if/expr-if-panic-fn.rs
index 36e49785a..36e49785a 100644
--- a/src/test/ui/expr/if/expr-if-panic-fn.rs
+++ b/tests/ui/expr/if/expr-if-panic-fn.rs
diff --git a/src/test/ui/expr/if/expr-if-panic-pass.rs b/tests/ui/expr/if/expr-if-panic-pass.rs
index 6069cd835..6069cd835 100644
--- a/src/test/ui/expr/if/expr-if-panic-pass.rs
+++ b/tests/ui/expr/if/expr-if-panic-pass.rs
diff --git a/src/test/ui/expr/if/expr-if-panic.rs b/tests/ui/expr/if/expr-if-panic.rs
index 520ee0870..520ee0870 100644
--- a/src/test/ui/expr/if/expr-if-panic.rs
+++ b/tests/ui/expr/if/expr-if-panic.rs
diff --git a/src/test/ui/expr/if/expr-if.rs b/tests/ui/expr/if/expr-if.rs
index 2b8474ff4..2b8474ff4 100644
--- a/src/test/ui/expr/if/expr-if.rs
+++ b/tests/ui/expr/if/expr-if.rs
diff --git a/src/test/ui/expr/if/if-branch-types.rs b/tests/ui/expr/if/if-branch-types.rs
index c125ba306..c125ba306 100644
--- a/src/test/ui/expr/if/if-branch-types.rs
+++ b/tests/ui/expr/if/if-branch-types.rs
diff --git a/src/test/ui/expr/if/if-branch-types.stderr b/tests/ui/expr/if/if-branch-types.stderr
index d2bba8821..d2bba8821 100644
--- a/src/test/ui/expr/if/if-branch-types.stderr
+++ b/tests/ui/expr/if/if-branch-types.stderr
diff --git a/src/test/ui/expr/if/if-check-panic.rs b/tests/ui/expr/if/if-check-panic.rs
index 037cd427c..037cd427c 100644
--- a/src/test/ui/expr/if/if-check-panic.rs
+++ b/tests/ui/expr/if/if-check-panic.rs
diff --git a/src/test/ui/expr/if/if-check.rs b/tests/ui/expr/if/if-check.rs
index 6593225e7..6593225e7 100644
--- a/src/test/ui/expr/if/if-check.rs
+++ b/tests/ui/expr/if/if-check.rs
diff --git a/src/test/ui/expr/if/if-cond-bot.rs b/tests/ui/expr/if/if-cond-bot.rs
index bcd114678..bcd114678 100644
--- a/src/test/ui/expr/if/if-cond-bot.rs
+++ b/tests/ui/expr/if/if-cond-bot.rs
diff --git a/src/test/ui/expr/if/if-else-type-mismatch.rs b/tests/ui/expr/if/if-else-type-mismatch.rs
index 1a0a36df2..1a0a36df2 100644
--- a/src/test/ui/expr/if/if-else-type-mismatch.rs
+++ b/tests/ui/expr/if/if-else-type-mismatch.rs
diff --git a/src/test/ui/expr/if/if-else-type-mismatch.stderr b/tests/ui/expr/if/if-else-type-mismatch.stderr
index f1fffdb1e..f1fffdb1e 100644
--- a/src/test/ui/expr/if/if-else-type-mismatch.stderr
+++ b/tests/ui/expr/if/if-else-type-mismatch.stderr
diff --git a/src/test/ui/expr/if/if-let-arm-types.rs b/tests/ui/expr/if/if-let-arm-types.rs
index 1e8260a01..1e8260a01 100644
--- a/src/test/ui/expr/if/if-let-arm-types.rs
+++ b/tests/ui/expr/if/if-let-arm-types.rs
diff --git a/src/test/ui/expr/if/if-let-arm-types.stderr b/tests/ui/expr/if/if-let-arm-types.stderr
index b40a0f479..b40a0f479 100644
--- a/src/test/ui/expr/if/if-let-arm-types.stderr
+++ b/tests/ui/expr/if/if-let-arm-types.stderr
diff --git a/src/test/ui/expr/if/if-let.rs b/tests/ui/expr/if/if-let.rs
index 7fdd2be95..7fdd2be95 100644
--- a/src/test/ui/expr/if/if-let.rs
+++ b/tests/ui/expr/if/if-let.rs
diff --git a/src/test/ui/expr/if/if-let.stderr b/tests/ui/expr/if/if-let.stderr
index c4bba3cb1..c4bba3cb1 100644
--- a/src/test/ui/expr/if/if-let.stderr
+++ b/tests/ui/expr/if/if-let.stderr
diff --git a/src/test/ui/expr/if/if-loop.rs b/tests/ui/expr/if/if-loop.rs
index 06d0bdf45..06d0bdf45 100644
--- a/src/test/ui/expr/if/if-loop.rs
+++ b/tests/ui/expr/if/if-loop.rs
diff --git a/src/test/ui/expr/if/if-no-match-bindings.rs b/tests/ui/expr/if/if-no-match-bindings.rs
index ca3df0fdd..ca3df0fdd 100644
--- a/src/test/ui/expr/if/if-no-match-bindings.rs
+++ b/tests/ui/expr/if/if-no-match-bindings.rs
diff --git a/src/test/ui/expr/if/if-no-match-bindings.stderr b/tests/ui/expr/if/if-no-match-bindings.stderr
index 737a5d604..737a5d604 100644
--- a/src/test/ui/expr/if/if-no-match-bindings.stderr
+++ b/tests/ui/expr/if/if-no-match-bindings.stderr
diff --git a/src/test/ui/expr/if/if-ret.rs b/tests/ui/expr/if/if-ret.rs
index 896072ce7..896072ce7 100644
--- a/src/test/ui/expr/if/if-ret.rs
+++ b/tests/ui/expr/if/if-ret.rs
diff --git a/src/test/ui/expr/if/if-ret.stderr b/tests/ui/expr/if/if-ret.stderr
index 8ced271aa..8ced271aa 100644
--- a/src/test/ui/expr/if/if-ret.stderr
+++ b/tests/ui/expr/if/if-ret.stderr
diff --git a/src/test/ui/expr/if/if-typeck.rs b/tests/ui/expr/if/if-typeck.rs
index d8c262bd6..d8c262bd6 100644
--- a/src/test/ui/expr/if/if-typeck.rs
+++ b/tests/ui/expr/if/if-typeck.rs
diff --git a/src/test/ui/expr/if/if-typeck.stderr b/tests/ui/expr/if/if-typeck.stderr
index 74ed0ed0a..74ed0ed0a 100644
--- a/src/test/ui/expr/if/if-typeck.stderr
+++ b/tests/ui/expr/if/if-typeck.stderr
diff --git a/src/test/ui/expr/if/if-without-block.rs b/tests/ui/expr/if/if-without-block.rs
index 5add9dfda..5add9dfda 100644
--- a/src/test/ui/expr/if/if-without-block.rs
+++ b/tests/ui/expr/if/if-without-block.rs
diff --git a/src/test/ui/expr/if/if-without-block.stderr b/tests/ui/expr/if/if-without-block.stderr
index 2d1ee04ce..2d1ee04ce 100644
--- a/src/test/ui/expr/if/if-without-block.stderr
+++ b/tests/ui/expr/if/if-without-block.stderr
diff --git a/src/test/ui/expr/if/if-without-else-as-fn-expr.rs b/tests/ui/expr/if/if-without-else-as-fn-expr.rs
index 19fbfb27b..19fbfb27b 100644
--- a/src/test/ui/expr/if/if-without-else-as-fn-expr.rs
+++ b/tests/ui/expr/if/if-without-else-as-fn-expr.rs
diff --git a/src/test/ui/expr/if/if-without-else-as-fn-expr.stderr b/tests/ui/expr/if/if-without-else-as-fn-expr.stderr
index 4daf27493..4daf27493 100644
--- a/src/test/ui/expr/if/if-without-else-as-fn-expr.stderr
+++ b/tests/ui/expr/if/if-without-else-as-fn-expr.stderr
diff --git a/src/test/ui/expr/if/if-without-else-result.rs b/tests/ui/expr/if/if-without-else-result.rs
index 95604758a..95604758a 100644
--- a/src/test/ui/expr/if/if-without-else-result.rs
+++ b/tests/ui/expr/if/if-without-else-result.rs
diff --git a/src/test/ui/expr/if/if-without-else-result.stderr b/tests/ui/expr/if/if-without-else-result.stderr
index 317faf7c6..317faf7c6 100644
--- a/src/test/ui/expr/if/if-without-else-result.stderr
+++ b/tests/ui/expr/if/if-without-else-result.stderr
diff --git a/src/test/ui/expr/if/issue-4201.rs b/tests/ui/expr/if/issue-4201.rs
index 59c465b9e..59c465b9e 100644
--- a/src/test/ui/expr/if/issue-4201.rs
+++ b/tests/ui/expr/if/issue-4201.rs
diff --git a/src/test/ui/expr/if/issue-4201.stderr b/tests/ui/expr/if/issue-4201.stderr
index 612fe7764..612fe7764 100644
--- a/src/test/ui/expr/if/issue-4201.stderr
+++ b/tests/ui/expr/if/issue-4201.stderr
diff --git a/src/test/ui/expr/malformed_closure/missing_braces_around_block.fixed b/tests/ui/expr/malformed_closure/missing_braces_around_block.fixed
index c50b9a12b..c50b9a12b 100644
--- a/src/test/ui/expr/malformed_closure/missing_braces_around_block.fixed
+++ b/tests/ui/expr/malformed_closure/missing_braces_around_block.fixed
diff --git a/src/test/ui/expr/malformed_closure/missing_braces_around_block.rs b/tests/ui/expr/malformed_closure/missing_braces_around_block.rs
index 58c81f3a6..58c81f3a6 100644
--- a/src/test/ui/expr/malformed_closure/missing_braces_around_block.rs
+++ b/tests/ui/expr/malformed_closure/missing_braces_around_block.rs
diff --git a/src/test/ui/expr/malformed_closure/missing_braces_around_block.stderr b/tests/ui/expr/malformed_closure/missing_braces_around_block.stderr
index dac9a8cfc..dac9a8cfc 100644
--- a/src/test/ui/expr/malformed_closure/missing_braces_around_block.stderr
+++ b/tests/ui/expr/malformed_closure/missing_braces_around_block.stderr
diff --git a/src/test/ui/expr/malformed_closure/ruby_style_closure.rs b/tests/ui/expr/malformed_closure/ruby_style_closure.rs
index e4341e196..fdec072b8 100644
--- a/src/test/ui/expr/malformed_closure/ruby_style_closure.rs
+++ b/tests/ui/expr/malformed_closure/ruby_style_closure.rs
@@ -8,7 +8,6 @@
 
 fn main() {
     let p = Some(45).and_then({
-        //~^ expected a `FnOnce<({integer},)>` closure, found `Option<_>`
         |x| println!("doubling {}", x);
         Some(x * 2)
         //~^ ERROR: cannot find value `x` in this scope
diff --git a/tests/ui/expr/malformed_closure/ruby_style_closure.stderr b/tests/ui/expr/malformed_closure/ruby_style_closure.stderr
new file mode 100644
index 000000000..e8b34121b
--- /dev/null
+++ b/tests/ui/expr/malformed_closure/ruby_style_closure.stderr
@@ -0,0 +1,9 @@
+error[E0425]: cannot find value `x` in this scope
+  --> $DIR/ruby_style_closure.rs:12:14
+   |
+LL |         Some(x * 2)
+   |              ^ not found in this scope
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0425`.