diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2018-02-07 08:30:47 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-07 08:30:47 -0800 |
| commit | aee22556a97aac4b921efb806b26fbb60a6b8a92 (patch) | |
| tree | 3f0ecfbabe72844da2e25a0d94c4cbeeb1095fb1 /src/test/ui/span | |
| parent | 4f93357d3b8938dfe439329c43c1e4f919a70869 (diff) | |
| parent | fd3f2312a75bcc4c8121ad324a012c3b8befb61c (diff) | |
| download | rust-aee22556a97aac4b921efb806b26fbb60a6b8a92.tar.gz rust-aee22556a97aac4b921efb806b26fbb60a6b8a92.zip | |
Rollup merge of #47613 - estebank:rustc_on_unimplemented, r=nikomatsakis
Add filtering options to `rustc_on_unimplemented` - Add filtering options to `rustc_on_unimplemented` for local traits, filtering on `Self` and type arguments. - Add a way to provide custom notes. - Tweak binops text. - Add filter to detect wether `Self` is local or belongs to another crate. - Add filter to `Iterator` diagnostic for `&str`. Partly addresses #44755 with a different syntax, as a first approach. Fixes #46216, fixes #37522, CC #34297, #46806.
Diffstat (limited to 'src/test/ui/span')
| -rw-r--r-- | src/test/ui/span/multiline-span-simple.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/span/multiline-span-simple.stderr | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/ui/span/multiline-span-simple.rs b/src/test/ui/span/multiline-span-simple.rs index f8e4cbcbf19..dd09534480e 100644 --- a/src/test/ui/span/multiline-span-simple.rs +++ b/src/test/ui/span/multiline-span-simple.rs @@ -20,7 +20,7 @@ fn main() { let x = 1; let y = 2; let z = 3; - foo(1 as u32 + //~ ERROR not satisfied + foo(1 as u32 + //~ ERROR cannot add `()` to `u32` bar(x, diff --git a/src/test/ui/span/multiline-span-simple.stderr b/src/test/ui/span/multiline-span-simple.stderr index b068798630e..a18dfeb31d9 100644 --- a/src/test/ui/span/multiline-span-simple.stderr +++ b/src/test/ui/span/multiline-span-simple.stderr @@ -1,7 +1,7 @@ -error[E0277]: the trait bound `u32: std::ops::Add<()>` is not satisfied +error[E0277]: cannot add `()` to `u32` --> $DIR/multiline-span-simple.rs:23:18 | -23 | foo(1 as u32 + //~ ERROR not satisfied +23 | foo(1 as u32 + //~ ERROR cannot add `()` to `u32` | ^ no implementation for `u32 + ()` | = help: the trait `std::ops::Add<()>` is not implemented for `u32` |