From 8e11189cbb129b5df33e27d21c077da6cfc5926f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20K=C3=BCber?= Date: Fri, 23 Jun 2017 17:43:35 -0700 Subject: [PATCH] Move tests to `ui` --- .../block-must-not-have-result-do.rs | 0 .../block-must-not-have-result-do.stderr | 11 +++++ .../block-must-not-have-result-res.rs | 0 .../block-must-not-have-result-res.stderr | 11 +++++ .../block-must-not-have-result-while.rs | 0 .../block-must-not-have-result-while.stderr | 11 +++++ .../consider-removing-last-semi.rs | 0 .../consider-removing-last-semi.stderr | 38 +++++++++++++++++ .../expected-return-on-unit.stderr | 4 ++ .../block-result}/issue-11714.rs | 0 src/test/ui/block-result/issue-11714.stderr | 21 ++++++++++ .../block-result}/issue-13428.rs | 0 src/test/ui/block-result/issue-13428.stderr | 41 +++++++++++++++++++ .../block-result}/issue-13624.rs | 0 src/test/ui/block-result/issue-13624.stderr | 20 +++++++++ .../block-result}/issue-20862.rs | 0 src/test/ui/block-result/issue-20862.stderr | 17 ++++++++ .../block-result}/issue-22645.rs | 0 src/test/ui/block-result/issue-22645.stderr | 21 ++++++++++ .../block-result}/issue-3563.rs | 0 src/test/ui/block-result/issue-3563.stderr | 17 ++++++++ .../block-result}/issue-5500.rs | 0 src/test/ui/block-result/issue-5500.stderr | 11 +++++ .../block-result/unexpected-return-on-unit.rs | 24 +++++++++++ .../unexpected-return-on-unit.stderr | 11 +++++ .../for-loop-has-unit-body.rs | 0 .../for-loop-has-unit-body.stderr | 11 +++++ 27 files changed, 269 insertions(+) rename src/test/{compile-fail => ui/block-result}/block-must-not-have-result-do.rs (100%) create mode 100644 src/test/ui/block-result/block-must-not-have-result-do.stderr rename src/test/{compile-fail => ui/block-result}/block-must-not-have-result-res.rs (100%) create mode 100644 src/test/ui/block-result/block-must-not-have-result-res.stderr rename src/test/{compile-fail => ui/block-result}/block-must-not-have-result-while.rs (100%) create mode 100644 src/test/ui/block-result/block-must-not-have-result-while.stderr rename src/test/{compile-fail => ui/block-result}/consider-removing-last-semi.rs (100%) create mode 100644 src/test/ui/block-result/consider-removing-last-semi.stderr create mode 100644 src/test/ui/block-result/expected-return-on-unit.stderr rename src/test/{compile-fail => ui/block-result}/issue-11714.rs (100%) create mode 100644 src/test/ui/block-result/issue-11714.stderr rename src/test/{compile-fail => ui/block-result}/issue-13428.rs (100%) create mode 100644 src/test/ui/block-result/issue-13428.stderr rename src/test/{compile-fail => ui/block-result}/issue-13624.rs (100%) create mode 100644 src/test/ui/block-result/issue-13624.stderr rename src/test/{compile-fail => ui/block-result}/issue-20862.rs (100%) create mode 100644 src/test/ui/block-result/issue-20862.stderr rename src/test/{compile-fail => ui/block-result}/issue-22645.rs (100%) create mode 100644 src/test/ui/block-result/issue-22645.stderr rename src/test/{compile-fail => ui/block-result}/issue-3563.rs (100%) create mode 100644 src/test/ui/block-result/issue-3563.stderr rename src/test/{compile-fail => ui/block-result}/issue-5500.rs (100%) create mode 100644 src/test/ui/block-result/issue-5500.stderr create mode 100644 src/test/ui/block-result/unexpected-return-on-unit.rs create mode 100644 src/test/ui/block-result/unexpected-return-on-unit.stderr rename src/test/{compile-fail => ui/mismatched_types}/for-loop-has-unit-body.rs (100%) create mode 100644 src/test/ui/mismatched_types/for-loop-has-unit-body.stderr diff --git a/src/test/compile-fail/block-must-not-have-result-do.rs b/src/test/ui/block-result/block-must-not-have-result-do.rs similarity index 100% rename from src/test/compile-fail/block-must-not-have-result-do.rs rename to src/test/ui/block-result/block-must-not-have-result-do.rs diff --git a/src/test/ui/block-result/block-must-not-have-result-do.stderr b/src/test/ui/block-result/block-must-not-have-result-do.stderr new file mode 100644 index 000000000000..a770ebeab35a --- /dev/null +++ b/src/test/ui/block-result/block-must-not-have-result-do.stderr @@ -0,0 +1,11 @@ +error[E0308]: mismatched types + --> $DIR/block-must-not-have-result-do.rs:13:9 + | +13 | true //~ ERROR mismatched types + | ^^^^ expected (), found bool + | + = note: expected type `()` + found type `bool` + +error: aborting due to previous error(s) + diff --git a/src/test/compile-fail/block-must-not-have-result-res.rs b/src/test/ui/block-result/block-must-not-have-result-res.rs similarity index 100% rename from src/test/compile-fail/block-must-not-have-result-res.rs rename to src/test/ui/block-result/block-must-not-have-result-res.rs diff --git a/src/test/ui/block-result/block-must-not-have-result-res.stderr b/src/test/ui/block-result/block-must-not-have-result-res.stderr new file mode 100644 index 000000000000..b1146864566e --- /dev/null +++ b/src/test/ui/block-result/block-must-not-have-result-res.stderr @@ -0,0 +1,11 @@ +error[E0308]: mismatched types + --> $DIR/block-must-not-have-result-res.rs:15:9 + | +15 | true //~ ERROR mismatched types + | ^^^^ expected (), found bool + | + = note: expected type `()` + found type `bool` + +error: aborting due to previous error(s) + diff --git a/src/test/compile-fail/block-must-not-have-result-while.rs b/src/test/ui/block-result/block-must-not-have-result-while.rs similarity index 100% rename from src/test/compile-fail/block-must-not-have-result-while.rs rename to src/test/ui/block-result/block-must-not-have-result-while.rs diff --git a/src/test/ui/block-result/block-must-not-have-result-while.stderr b/src/test/ui/block-result/block-must-not-have-result-while.stderr new file mode 100644 index 000000000000..31ec7cdd3c5a --- /dev/null +++ b/src/test/ui/block-result/block-must-not-have-result-while.stderr @@ -0,0 +1,11 @@ +error[E0308]: mismatched types + --> $DIR/block-must-not-have-result-while.rs:13:9 + | +13 | true //~ ERROR mismatched types + | ^^^^ expected (), found bool + | + = note: expected type `()` + found type `bool` + +error: aborting due to previous error(s) + diff --git a/src/test/compile-fail/consider-removing-last-semi.rs b/src/test/ui/block-result/consider-removing-last-semi.rs similarity index 100% rename from src/test/compile-fail/consider-removing-last-semi.rs rename to src/test/ui/block-result/consider-removing-last-semi.rs diff --git a/src/test/ui/block-result/consider-removing-last-semi.stderr b/src/test/ui/block-result/consider-removing-last-semi.stderr new file mode 100644 index 000000000000..944c9d6c4279 --- /dev/null +++ b/src/test/ui/block-result/consider-removing-last-semi.stderr @@ -0,0 +1,38 @@ +error[E0308]: mismatched types + --> $DIR/consider-removing-last-semi.rs:11:18 + | +11 | fn f() -> String { //~ ERROR mismatched types + | __________________^ +12 | | 0u8; +13 | | "bla".to_string(); //~ HELP consider removing this semicolon +14 | | } + | |_^ expected struct `std::string::String`, found () + | + = note: expected type `std::string::String` + found type `()` +help: consider removing this semicolon: + --> $DIR/consider-removing-last-semi.rs:13:22 + | +13 | "bla".to_string(); //~ HELP consider removing this semicolon + | ^ + +error[E0308]: mismatched types + --> $DIR/consider-removing-last-semi.rs:16:18 + | +16 | fn g() -> String { //~ ERROR mismatched types + | __________________^ +17 | | "this won't work".to_string(); +18 | | "removeme".to_string(); //~ HELP consider removing this semicolon +19 | | } + | |_^ expected struct `std::string::String`, found () + | + = note: expected type `std::string::String` + found type `()` +help: consider removing this semicolon: + --> $DIR/consider-removing-last-semi.rs:18:27 + | +18 | "removeme".to_string(); //~ HELP consider removing this semicolon + | ^ + +error: aborting due to previous error(s) + diff --git a/src/test/ui/block-result/expected-return-on-unit.stderr b/src/test/ui/block-result/expected-return-on-unit.stderr new file mode 100644 index 000000000000..8a0d7a335d6a --- /dev/null +++ b/src/test/ui/block-result/expected-return-on-unit.stderr @@ -0,0 +1,4 @@ +error[E0601]: main function not found + +error: aborting due to previous error(s) + diff --git a/src/test/compile-fail/issue-11714.rs b/src/test/ui/block-result/issue-11714.rs similarity index 100% rename from src/test/compile-fail/issue-11714.rs rename to src/test/ui/block-result/issue-11714.rs diff --git a/src/test/ui/block-result/issue-11714.stderr b/src/test/ui/block-result/issue-11714.stderr new file mode 100644 index 000000000000..cba9c3f51d7e --- /dev/null +++ b/src/test/ui/block-result/issue-11714.stderr @@ -0,0 +1,21 @@ +error[E0308]: mismatched types + --> $DIR/issue-11714.rs:11:18 + | +11 | fn blah() -> i32 { //~ ERROR mismatched types + | __________________^ +12 | | 1 +13 | | +14 | | ; //~ HELP consider removing this semicolon: +15 | | } + | |_^ expected i32, found () + | + = note: expected type `i32` + found type `()` +help: consider removing this semicolon: + --> $DIR/issue-11714.rs:14:5 + | +14 | ; //~ HELP consider removing this semicolon: + | ^ + +error: aborting due to previous error(s) + diff --git a/src/test/compile-fail/issue-13428.rs b/src/test/ui/block-result/issue-13428.rs similarity index 100% rename from src/test/compile-fail/issue-13428.rs rename to src/test/ui/block-result/issue-13428.rs diff --git a/src/test/ui/block-result/issue-13428.stderr b/src/test/ui/block-result/issue-13428.stderr new file mode 100644 index 000000000000..d0ed8935cd77 --- /dev/null +++ b/src/test/ui/block-result/issue-13428.stderr @@ -0,0 +1,41 @@ +error[E0308]: mismatched types + --> $DIR/issue-13428.rs:13:20 + | +13 | fn foo() -> String { //~ ERROR mismatched types + | ____________________^ +14 | | format!("Hello {}", +15 | | "world") +16 | | // Put the trailing semicolon on its own line to test that the +17 | | // note message gets the offending semicolon exactly +18 | | ; //~ HELP consider removing this semicolon +19 | | } + | |_^ expected struct `std::string::String`, found () + | + = note: expected type `std::string::String` + found type `()` +help: consider removing this semicolon: + --> $DIR/issue-13428.rs:18:5 + | +18 | ; //~ HELP consider removing this semicolon + | ^ + +error[E0308]: mismatched types + --> $DIR/issue-13428.rs:21:20 + | +21 | fn bar() -> String { //~ ERROR mismatched types + | ____________________^ +22 | | "foobar".to_string() +23 | | ; //~ HELP consider removing this semicolon +24 | | } + | |_^ expected struct `std::string::String`, found () + | + = note: expected type `std::string::String` + found type `()` +help: consider removing this semicolon: + --> $DIR/issue-13428.rs:23:5 + | +23 | ; //~ HELP consider removing this semicolon + | ^ + +error: aborting due to previous error(s) + diff --git a/src/test/compile-fail/issue-13624.rs b/src/test/ui/block-result/issue-13624.rs similarity index 100% rename from src/test/compile-fail/issue-13624.rs rename to src/test/ui/block-result/issue-13624.rs diff --git a/src/test/ui/block-result/issue-13624.stderr b/src/test/ui/block-result/issue-13624.stderr new file mode 100644 index 000000000000..72ff859d7e93 --- /dev/null +++ b/src/test/ui/block-result/issue-13624.stderr @@ -0,0 +1,20 @@ +error[E0308]: mismatched types + --> $DIR/issue-13624.rs:17:5 + | +17 | Enum::EnumStructVariant { x: 1, y: 2, z: 3 } + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found enum `a::Enum` + | + = note: expected type `()` + found type `a::Enum` + +error[E0308]: mismatched types + --> $DIR/issue-13624.rs:32:9 + | +32 | a::Enum::EnumStructVariant { x, y, z } => { + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found enum `a::Enum` + | + = note: expected type `()` + found type `a::Enum` + +error: aborting due to previous error(s) + diff --git a/src/test/compile-fail/issue-20862.rs b/src/test/ui/block-result/issue-20862.rs similarity index 100% rename from src/test/compile-fail/issue-20862.rs rename to src/test/ui/block-result/issue-20862.rs diff --git a/src/test/ui/block-result/issue-20862.stderr b/src/test/ui/block-result/issue-20862.stderr new file mode 100644 index 000000000000..757fe1666c35 --- /dev/null +++ b/src/test/ui/block-result/issue-20862.stderr @@ -0,0 +1,17 @@ +error[E0308]: mismatched types + --> $DIR/issue-20862.rs:12:5 + | +12 | |y| x + y + | ^^^^^^^^^ expected (), found closure + | + = note: expected type `()` + found type `[closure@$DIR/issue-20862.rs:12:5: 12:14 x:_]` + +error[E0618]: expected function, found `()` + --> $DIR/issue-20862.rs:17:13 + | +17 | let x = foo(5)(2); + | ^^^^^^^^^ + +error: aborting due to previous error(s) + diff --git a/src/test/compile-fail/issue-22645.rs b/src/test/ui/block-result/issue-22645.rs similarity index 100% rename from src/test/compile-fail/issue-22645.rs rename to src/test/ui/block-result/issue-22645.rs diff --git a/src/test/ui/block-result/issue-22645.stderr b/src/test/ui/block-result/issue-22645.stderr new file mode 100644 index 000000000000..3921a301c922 --- /dev/null +++ b/src/test/ui/block-result/issue-22645.stderr @@ -0,0 +1,21 @@ +error[E0277]: the trait bound `{integer}: Scalar` is not satisfied + --> $DIR/issue-22645.rs:25:5 + | +25 | b + 3 //~ ERROR E0277 + | ^ the trait `Scalar` is not implemented for `{integer}` + | + = help: the following implementations were found: + + = note: required because of the requirements on the impl of `std::ops::Add<{integer}>` for `Bob` + +error[E0308]: mismatched types + --> $DIR/issue-22645.rs:25:3 + | +25 | b + 3 //~ ERROR E0277 + | ^^^^^ expected (), found struct `Bob` + | + = note: expected type `()` + found type `Bob` + +error: aborting due to previous error(s) + diff --git a/src/test/compile-fail/issue-3563.rs b/src/test/ui/block-result/issue-3563.rs similarity index 100% rename from src/test/compile-fail/issue-3563.rs rename to src/test/ui/block-result/issue-3563.rs diff --git a/src/test/ui/block-result/issue-3563.stderr b/src/test/ui/block-result/issue-3563.stderr new file mode 100644 index 000000000000..9b403bcd93db --- /dev/null +++ b/src/test/ui/block-result/issue-3563.stderr @@ -0,0 +1,17 @@ +error[E0599]: no method named `b` found for type `&Self` in the current scope + --> $DIR/issue-3563.rs:13:17 + | +13 | || self.b() + | ^ + +error[E0308]: mismatched types + --> $DIR/issue-3563.rs:13:9 + | +13 | || self.b() + | ^^^^^^^^^^^ expected (), found closure + | + = note: expected type `()` + found type `[closure@$DIR/issue-3563.rs:13:9: 13:20 self:_]` + +error: aborting due to previous error(s) + diff --git a/src/test/compile-fail/issue-5500.rs b/src/test/ui/block-result/issue-5500.rs similarity index 100% rename from src/test/compile-fail/issue-5500.rs rename to src/test/ui/block-result/issue-5500.rs diff --git a/src/test/ui/block-result/issue-5500.stderr b/src/test/ui/block-result/issue-5500.stderr new file mode 100644 index 000000000000..bffe2a82ca8d --- /dev/null +++ b/src/test/ui/block-result/issue-5500.stderr @@ -0,0 +1,11 @@ +error[E0308]: mismatched types + --> $DIR/issue-5500.rs:12:5 + | +12 | &panic!() + | ^^^^^^^^^ expected (), found reference + | + = note: expected type `()` + found type `&_` + +error: aborting due to previous error(s) + diff --git a/src/test/ui/block-result/unexpected-return-on-unit.rs b/src/test/ui/block-result/unexpected-return-on-unit.rs new file mode 100644 index 000000000000..291b7a16f141 --- /dev/null +++ b/src/test/ui/block-result/unexpected-return-on-unit.rs @@ -0,0 +1,24 @@ +// Copyright 2017 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Test that we do some basic error correcton in the tokeniser (and don't spew +// too many bogus errors). + +fn foo() -> usize { + 3 +} + +fn bar() { + foo() +} + +fn main() { + bar() +} diff --git a/src/test/ui/block-result/unexpected-return-on-unit.stderr b/src/test/ui/block-result/unexpected-return-on-unit.stderr new file mode 100644 index 000000000000..ad10312d064d --- /dev/null +++ b/src/test/ui/block-result/unexpected-return-on-unit.stderr @@ -0,0 +1,11 @@ +error[E0308]: mismatched types + --> $DIR/unexpected-return-on-unit.rs:19:5 + | +19 | foo() + | ^^^^^ expected (), found usize + | + = note: expected type `()` + found type `usize` + +error: aborting due to previous error(s) + diff --git a/src/test/compile-fail/for-loop-has-unit-body.rs b/src/test/ui/mismatched_types/for-loop-has-unit-body.rs similarity index 100% rename from src/test/compile-fail/for-loop-has-unit-body.rs rename to src/test/ui/mismatched_types/for-loop-has-unit-body.rs diff --git a/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr b/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr new file mode 100644 index 000000000000..6787fe91bf30 --- /dev/null +++ b/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr @@ -0,0 +1,11 @@ +error[E0308]: mismatched types + --> $DIR/for-loop-has-unit-body.rs:13:9 + | +13 | x //~ ERROR mismatched types + | ^ expected (), found integral variable + | + = note: expected type `()` + found type `{integer}` + +error: aborting due to previous error(s) +