OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #62880 - fakenine:normalize_use_of_backticks_compiler_messages_p14, r=Centril

Browse Source 
normalize use of backticks in compiler messages for librustc_allocator

https://github.com/rust-lang/rust/issues/60532
This commit is contained in:
Mark Rousskov 2019-07-23 12:51:19 -04:00 committed by GitHub
commit 32e5f985eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc_allocator/expand.rs
View File

@ -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")
}
}
}

2
src/test/ui/allocator/two-allocators.rs
View File

@ -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
src/test/ui/allocator/two-allocators.stderr
View File

@ -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;