about summary refs log tree commit diff
path: root/src/test/ui/allocator
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2019-11-25 12:27:50 -0800
committerEsteban Küber <esteban@kuber.com.ar>2019-11-25 13:30:48 -0800
commit9a595417a2d5fdff62fb2a570756c5ce6f8eb0d2 (patch)
tree21336c9ea4ccf8e10dcf0797fdfe053a18125235 /src/test/ui/allocator
parent00fe97ad0e440d78a3dbf8df77ac5192ca6d6403 (diff)
downloadrust-9a595417a2d5fdff62fb2a570756c5ce6f8eb0d2.tar.gz
rust-9a595417a2d5fdff62fb2a570756c5ce6f8eb0d2.zip
Tweak multiple allocators error
Diffstat (limited to 'src/test/ui/allocator')
-rw-r--r--src/test/ui/allocator/two-allocators.stderr11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/test/ui/allocator/two-allocators.stderr b/src/test/ui/allocator/two-allocators.stderr
index ed0aa13eb80..35d9f0f42f0 100644
--- a/src/test/ui/allocator/two-allocators.stderr
+++ b/src/test/ui/allocator/two-allocators.stderr
@@ -1,14 +1,11 @@
 error: cannot define multiple global allocators
   --> $DIR/two-allocators.rs:6:1
    |
-LL | static B: System = System;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-note: the previous global allocator is defined here
-  --> $DIR/two-allocators.rs:4:1
-   |
 LL | static A: System = System;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | -------------------------- previous global allocator is defined here
+LL | #[global_allocator]
+LL | static B: System = System;
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot define a new global allocator
 
 error: aborting due to previous error