Skip to content

Commit

Permalink
Rollup merge of rust-lang#62880 - fakenine:normalize_use_of_backticks…
Browse files Browse the repository at this point in the history
…_compiler_messages_p14, r=Centril

normalize use of backticks in compiler messages for librustc_allocator

rust-lang#60532
  • Loading branch information
Mark-Simulacrum authored Jul 23, 2019
2 parents f11ffd3 + 1a7127b commit 32e5f98
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/librustc_allocator/expand.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/allocator/two-allocators.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {}
2 changes: 1 addition & 1 deletion src/test/ui/allocator/two-allocators.stderr
Original file line number Diff line number Diff line change
@@ -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;
Expand Down

0 comments on commit 32e5f98

Please sign in to comment.