diff options
| author | bors <bors@rust-lang.org> | 2016-09-04 06:06:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-04 06:06:37 -0700 |
| commit | 987b47549eae03e4d9699336f5e30f787161acaa (patch) | |
| tree | 5e7eb63f8f244e3d1961b69dacb8bfeacdff849b /src/test | |
| parent | e77d86c142ae668038dd43594d04022cbd6bf4d8 (diff) | |
| parent | 55893f0da7427c14be55837fada2d062db387ec9 (diff) | |
| download | rust-987b47549eae03e4d9699336f5e30f787161acaa.tar.gz rust-987b47549eae03e4d9699336f5e30f787161acaa.zip | |
Auto merge of #36255 - Manishearth:rollup, r=Manishearth
Rollup of 7 pull requests - Successful merges: #36070, #36132, #36200, #36212, #36225, #36231, #36234 - Failed merges:
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/compile-fail/E0458.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/E0459.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/span/E0493.rs (renamed from src/test/compile-fail/E0493.rs) | 10 | ||||
| -rw-r--r-- | src/test/ui/span/E0493.stderr | 11 |
4 files changed, 24 insertions, 2 deletions
diff --git a/src/test/compile-fail/E0458.rs b/src/test/compile-fail/E0458.rs index 21bedc6b84c..e87158ae3b0 100644 --- a/src/test/compile-fail/E0458.rs +++ b/src/test/compile-fail/E0458.rs @@ -9,7 +9,9 @@ // except according to those terms. #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458 - //~^ ERROR E0459 + //~| NOTE unknown kind + //~| ERROR E0459 + //~| NOTE missing `name` argument fn main() { } diff --git a/src/test/compile-fail/E0459.rs b/src/test/compile-fail/E0459.rs index dc7ac714f22..41376bd9ef5 100644 --- a/src/test/compile-fail/E0459.rs +++ b/src/test/compile-fail/E0459.rs @@ -9,6 +9,7 @@ // except according to those terms. #[link(kind = "dylib")] extern {} //~ ERROR E0459 + //~| NOTE missing `name` argument fn main() { } diff --git a/src/test/compile-fail/E0493.rs b/src/test/ui/span/E0493.rs index 689f469533d..ea4526b70f6 100644 --- a/src/test/compile-fail/E0493.rs +++ b/src/test/ui/span/E0493.rs @@ -16,7 +16,15 @@ impl Drop for Foo { fn drop(&mut self) {} } -const F : Foo = Foo { a : 0 }; //~ ERROR E0493 +struct Bar { + a: u32 +} + +impl Drop for Bar { + fn drop(&mut self) {} +} + +const F : Foo = Foo { a : 0 }; fn main() { } diff --git a/src/test/ui/span/E0493.stderr b/src/test/ui/span/E0493.stderr new file mode 100644 index 00000000000..afcc9a240eb --- /dev/null +++ b/src/test/ui/span/E0493.stderr @@ -0,0 +1,11 @@ +error[E0493]: constants are not allowed to have destructors + --> $DIR/E0493.rs:27:17 + | +16 | fn drop(&mut self) {} + | --------------------- destructor defined here +... +27 | const F : Foo = Foo { a : 0 }; + | ^^^^^^^^^^^^^ constants cannot have destructors + +error: aborting due to previous error + |