From 7d2231aa22c80f47deea5b482ae03ae0cb2ae827 Mon Sep 17 00:00:00 2001 From: P1start Date: Tue, 21 Apr 2015 21:13:42 +1200 Subject: Change a few error messages to give code suggestions PR #24242 added the ability to the compiler to directly give suggestions about how to modify code to fix an error. The new errors look like this: foobar.rs:5:12: 5:25 error: expected a path on the left-hand side of `+`, not `&'static Copy` [E0178] foobar.rs:5 let x: &'static Copy + 'static; ^~~~~~~~~~~~~ foobar.rs:5:12: 5:35 help: try adding parentheses (per RFC 438): foobar.rs: let x: &'static (Copy + 'static); foobar.rs:2:13: 2:23 error: cast to unsized type: `&_` as `core::marker::Copy` foobar.rs:2 let x = &1 as Copy; ^~~~~~~~~~ foobar.rs:2:19: 2:23 help: try casting to a reference instead: foobar.rs: let x = &1 as &Copy; foobar.rs:7:24: 7:25 error: expected expression, found `;` foobar.rs:7 let x = box (1 + 1); ^ foobar.rs:7:13: 7:16 help: try using `box()` instead: foobar.rs: let x = box() (1 + 1); This also modifies compiletest to give the ability to directly test suggestions given by error messages. --- .../cast-to-unsized-trait-object-suggestion.rs | 20 ++++++++++++++++++++ src/test/compile-fail/issue-17441.rs | 2 +- src/test/compile-fail/issue-6702.rs | 2 +- ...ait-object-reference-without-parens-suggestion.rs | 20 ++++++++++++++++++++ .../parse-fail/parenthesized-box-expr-message.rs | 4 +++- 5 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 src/test/compile-fail/cast-to-unsized-trait-object-suggestion.rs create mode 100644 src/test/compile-fail/trait-object-reference-without-parens-suggestion.rs (limited to 'src/test') diff --git a/src/test/compile-fail/cast-to-unsized-trait-object-suggestion.rs b/src/test/compile-fail/cast-to-unsized-trait-object-suggestion.rs new file mode 100644 index 00000000000..4e6ae96e3fc --- /dev/null +++ b/src/test/compile-fail/cast-to-unsized-trait-object-suggestion.rs @@ -0,0 +1,20 @@ +// Copyright 2015 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. + +fn main() { + &1 as Copy; + //~^ ERROR cast to unsized type + //~| HELP try casting to a reference instead: + //~| SUGGESTION &1 as &Copy; + Box::new(1) as Copy; + //~^ ERROR cast to unsized type + //~| HELP try casting to a `Box` instead: + //~| SUGGESTION Box::new(1) as Box; +} diff --git a/src/test/compile-fail/issue-17441.rs b/src/test/compile-fail/issue-17441.rs index 68ddef67188..46a64f99354 100644 --- a/src/test/compile-fail/issue-17441.rs +++ b/src/test/compile-fail/issue-17441.rs @@ -16,7 +16,7 @@ fn main() { // FIXME (#22405): Replace `Box::new` with `box` here when/if possible. let _bar = Box::new(1_usize) as std::fmt::Debug; //~^ ERROR cast to unsized type: `Box` as `core::fmt::Debug` - //~^^ HELP did you mean `Box`? + //~^^ HELP try casting to a `Box` instead let _baz = 1_usize as std::fmt::Debug; //~^ ERROR cast to unsized type: `usize` as `core::fmt::Debug` diff --git a/src/test/compile-fail/issue-6702.rs b/src/test/compile-fail/issue-6702.rs index d035c615ec3..e464ddf54c2 100644 --- a/src/test/compile-fail/issue-6702.rs +++ b/src/test/compile-fail/issue-6702.rs @@ -15,5 +15,5 @@ struct Monster { fn main() { let _m = Monster(); //~ ERROR `Monster` is a structure name, but - //~^ HELP Did you mean to write: `Monster { /* fields */ }`? + //~^ HELP did you mean to write: `Monster { /* fields */ }`? } diff --git a/src/test/compile-fail/trait-object-reference-without-parens-suggestion.rs b/src/test/compile-fail/trait-object-reference-without-parens-suggestion.rs new file mode 100644 index 00000000000..fc2ed83b272 --- /dev/null +++ b/src/test/compile-fail/trait-object-reference-without-parens-suggestion.rs @@ -0,0 +1,20 @@ +// Copyright 2015 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. + +fn main() { + let _: &Copy + 'static; + //~^ ERROR expected a path + //~| HELP try adding parentheses + //~| SUGGESTION let _: &(Copy + 'static); + let _: &'static Copy + 'static; + //~^ ERROR expected a path + //~| HELP try adding parentheses + //~| SUGGESTION let _: &'static (Copy + 'static); +} diff --git a/src/test/parse-fail/parenthesized-box-expr-message.rs b/src/test/parse-fail/parenthesized-box-expr-message.rs index 05bbaec37af..28c64dbc753 100644 --- a/src/test/parse-fail/parenthesized-box-expr-message.rs +++ b/src/test/parse-fail/parenthesized-box-expr-message.rs @@ -9,6 +9,8 @@ // except according to those terms. fn main() { - box(1 + 1) //~ HELP perhaps you meant `box() (foo)` instead? + box (1 + 1) + //~^ HELP try using `box()` instead: + //~| SUGGESTION box() (1 + 1) ; //~ ERROR expected expression, found `;` } -- cgit 1.4.1-3-g733a5