diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2018-09-10 17:14:30 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2018-09-10 17:21:01 -0400 |
| commit | 5adbdf82f3dd345b31d097c42639b88e96f84ed8 (patch) | |
| tree | f37976722afedebb046e38dbbf7d4281745276fd | |
| parent | b1a9f9eae8477042baffe24f560c0ce8fe08e70d (diff) | |
| download | rust-5adbdf82f3dd345b31d097c42639b88e96f84ed8.tar.gz rust-5adbdf82f3dd345b31d097c42639b88e96f84ed8.zip | |
add test case
| -rw-r--r-- | src/test/ui/rust-2018/try-macro.fixed | 16 | ||||
| -rw-r--r-- | src/test/ui/rust-2018/try-macro.rs | 16 | ||||
| -rw-r--r-- | src/test/ui/rust-2018/try-macro.stderr | 15 |
3 files changed, 47 insertions, 0 deletions
diff --git a/src/test/ui/rust-2018/try-macro.fixed b/src/test/ui/rust-2018/try-macro.fixed new file mode 100644 index 00000000000..c65f0fc30ef --- /dev/null +++ b/src/test/ui/rust-2018/try-macro.fixed @@ -0,0 +1,16 @@ +// Test that `try!` macros are rewritten. + +// run-rustfix +// compile-pass + +#![warn(rust_2018_compatibility)] +#![allow(unused_variables)] +#![allow(dead_code)] + +fn foo() -> Result<usize, ()> { + let x: Result<usize, ()> = Ok(22); + r#try!(x); + Ok(44) +} + +fn main() { } diff --git a/src/test/ui/rust-2018/try-macro.rs b/src/test/ui/rust-2018/try-macro.rs new file mode 100644 index 00000000000..f435890a61d --- /dev/null +++ b/src/test/ui/rust-2018/try-macro.rs @@ -0,0 +1,16 @@ +// Test that `try!` macros are rewritten. + +// run-rustfix +// compile-pass + +#![warn(rust_2018_compatibility)] +#![allow(unused_variables)] +#![allow(dead_code)] + +fn foo() -> Result<usize, ()> { + let x: Result<usize, ()> = Ok(22); + try!(x); + Ok(44) +} + +fn main() { } diff --git a/src/test/ui/rust-2018/try-macro.stderr b/src/test/ui/rust-2018/try-macro.stderr new file mode 100644 index 00000000000..40a4564cc3d --- /dev/null +++ b/src/test/ui/rust-2018/try-macro.stderr @@ -0,0 +1,15 @@ +warning: `try` is a keyword in the 2018 edition + --> $DIR/try-macro.rs:12:5 + | +LL | try!(x); + | ^^^ help: you can use a raw identifier to stay compatible: `r#try` + | +note: lint level defined here + --> $DIR/try-macro.rs:6:9 + | +LL | #![warn(rust_2018_compatibility)] + | ^^^^^^^^^^^^^^^^^^^^^^^ + = note: #[warn(keyword_idents)] implied by #[warn(rust_2018_compatibility)] + = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition! + = note: for more information, see issue #49716 <https://github.com/rust-lang/rust/issues/49716> + |
