bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #89483 - hkmatsumoto:patch-diagnostics-2, r=estebank

Browse source 
Practice diagnostic message convention

Detected by #89455.

r? ```@estebank```
This commit is contained in:
Jubilee 2021-10-04 13:58:15 -07:00 • committed by GitHub
commit 5352e17df3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 167 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_metadata/src/creader.rs
View file

@ -878,7 +878,7 @@ impl<'a> CrateLoader<'a> {
"no global memory allocator found but one is \
required; link to std or \
add `#[global_allocator]` to a static item \
that implements the GlobalAlloc trait.",
that implements the GlobalAlloc trait",
);
}
self.cstore.allocator_kind = Some(AllocatorKind::Default);

4
compiler/rustc_metadata/src/native_libs.rs
View file

@ -319,13 +319,13 @@ impl Collector<'tcx> {
self.tcx.sess.err(&format!(
"renaming of the library `{}` was specified, \
however this crate contains no `#[link(...)]` \
attributes referencing this library.",
attributes referencing this library",
lib.name
));
} else if !renames.insert(&lib.name) {
self.tcx.sess.err(&format!(
"multiple renamings were \
specified for library `{}` .",
specified for library `{}`",
lib.name
));
}