diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-07-23 12:51:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-23 12:51:19 -0400 |
| commit | 32e5f985eb20592983d75289ac245d3221a6817b (patch) | |
| tree | 1136f22906b4fa222653a25663427c29f6654c84 | |
| parent | f11ffd3a6a2b8dfef45e58dc6c6400f135fa6c35 (diff) | |
| parent | 1a7127bbc469ba10c11d9d2d0b10669aff38b90c (diff) | |
| download | rust-32e5f985eb20592983d75289ac245d3221a6817b.tar.gz rust-32e5f985eb20592983d75289ac245d3221a6817b.zip | |
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
| -rw-r--r-- | src/librustc_allocator/expand.rs | 4 | ||||
| -rw-r--r-- | src/test/ui/allocator/two-allocators.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/allocator/two-allocators.stderr | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc_allocator/expand.rs b/src/librustc_allocator/expand.rs index 87373364c4d..af63fffc0f9 100644 --- a/src/librustc_allocator/expand.rs +++ b/src/librustc_allocator/expand.rs @@ -79,7 +79,7 @@ impl MutVisitor for ExpandAllocatorDirectives<'_> { if self.found { self.handler - .span_err(item.span, "cannot define more than one #[global_allocator]"); + .span_err(item.span, "cannot define more than one `#[global_allocator]`"); return smallvec![item]; } self.found = true; @@ -280,7 +280,7 @@ impl AllocFnFactory<'_> { AllocatorTy::Unit => (self.cx.ty(self.span, TyKind::Tup(Vec::new())), expr), AllocatorTy::Layout | AllocatorTy::Usize | AllocatorTy::Ptr => { - panic!("can't convert AllocatorTy to an output") + panic!("can't convert `AllocatorTy` to an output") } } } 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; |