about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2019-07-23 12:51:19 -0400
committerGitHub <noreply@github.com>2019-07-23 12:51:19 -0400
commit32e5f985eb20592983d75289ac245d3221a6817b (patch)
tree1136f22906b4fa222653a25663427c29f6654c84 /src/test
parentf11ffd3a6a2b8dfef45e58dc6c6400f135fa6c35 (diff)
parent1a7127bbc469ba10c11d9d2d0b10669aff38b90c (diff)
Rollup merge of #62880 - fakenine:normalize_use_of_backticks_compiler_messages_p14, r=Centril
normalize use of backticks in compiler messages for librustc_allocator

https://github.com/rust-lang/rust/issues/60532
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/allocator/two-allocators.rs2
-rw-r--r--src/test/ui/allocator/two-allocators.stderr2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/allocator/two-allocators.rs b/src/test/ui/allocator/two-allocators.rs
index 10fb03c3930..0f81fc41823 100644
--- a/src/test/ui/allocator/two-allocators.rs
+++ b/src/test/ui/allocator/two-allocators.rs
@@ -4,6 +4,6 @@ use std::alloc::System;
 static A: System = System;
 #[global_allocator]
 static B: System = System;
-//~^ ERROR: cannot define more than one #[global_allocator]
+//~^ ERROR: cannot define more than one `#[global_allocator]`
 
 fn main() {}
diff --git a/src/test/ui/allocator/two-allocators.stderr b/src/test/ui/allocator/two-allocators.stderr
index da247f6c316..6b0c2b2a25d 100644
--- a/src/test/ui/allocator/two-allocators.stderr
+++ b/src/test/ui/allocator/two-allocators.stderr
@@ -1,4 +1,4 @@
-error: cannot define more than one #[global_allocator]
+error: cannot define more than one `#[global_allocator]`
   --> $DIR/two-allocators.rs:6:1
    |
 LL | static B: System = System;