Rollup merge of #62478 - fakenine:normalize_use_of_backticks_compiler_messages_p3, r=Centril

normalize use of backticks for compiler messages in librustc_codegen

https://github.com/rust-lang/rust/issues/60532
This commit is contained in:
Mazdak Farrokhzad 2019-07-08 02:40:58 +02:00 committed by GitHub
commit ada2684c80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 11 deletions

View File

@ -146,7 +146,7 @@ fn inline_asm_call(
unsafe {
// Ask LLVM to verify that the constraints are well-formed.
let constraints_ok = llvm::LLVMRustInlineAsmVerify(fty, cons.as_ptr());
debug!("Constraint verification result: {:?}", constraints_ok);
debug!("constraint verification result: {:?}", constraints_ok);
if constraints_ok {
let v = llvm::LLVMRustInlineAsm(
fty,

View File

@ -215,7 +215,7 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
funclet: Option<&Funclet<'ll>>,
) -> &'ll Value {
debug!("Invoke {:?} with args ({:?})",
debug!("invoke {:?} with args ({:?})",
llfn,
args);
@ -1035,7 +1035,7 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
funclet: Option<&Funclet<'ll>>,
) -> &'ll Value {
debug!("Call {:?} with args ({:?})",
debug!("call {:?} with args ({:?})",
llfn,
args);
@ -1238,7 +1238,7 @@ impl Builder<'a, 'll, 'tcx> {
if dest_ptr_ty == stored_ptr_ty {
ptr
} else {
debug!("Type mismatch in store. \
debug!("type mismatch in store. \
Expected {:?}, got {:?}; inserting bitcast",
dest_ptr_ty, stored_ptr_ty);
self.bitcast(ptr, stored_ptr_ty)
@ -1274,7 +1274,7 @@ impl Builder<'a, 'll, 'tcx> {
.map(|(i, (expected_ty, &actual_val))| {
let actual_ty = self.val_ty(actual_val);
if expected_ty != actual_ty {
debug!("Type mismatch in function call of {:?}. \
debug!("type mismatch in function call of {:?}. \
Expected {:?} for param {}, got {:?}; injecting bitcast",
llfn, expected_ty, i, actual_ty);
self.bitcast(actual_val, expected_ty)

View File

@ -433,7 +433,7 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(cx: &'
if cx.get_defined_value("main").is_some() {
// FIXME: We should be smart and show a better diagnostic here.
cx.sess().struct_span_err(sp, "entry symbol `main` defined multiple times")
.help("did you use #[no_mangle] on `fn main`? Use #[start] instead")
.help("did you use `#[no_mangle]` on `fn main`? Use `#[start]` instead")
.emit();
cx.sess().abort_if_errors();
bug!();

View File

@ -138,7 +138,7 @@ impl<'a, 'tcx, V: CodegenObject> PlaceRef<'tcx, V> {
// * packed struct - there is no alignment padding
match field.ty.sty {
_ if self.llextra.is_none() => {
debug!("Unsized field `{}`, of `{:?}` has no metadata for adjustment",
debug!("unsized field `{}`, of `{:?}` has no metadata for adjustment",
ix, self.llval);
return simple();
}

View File

@ -57,7 +57,7 @@ pub fn find_crate_name(sess: Option<&Session>,
if let Some(ref s) = sess.opts.crate_name {
if let Some((attr, name)) = attr_crate_name {
if name.as_str() != *s {
let msg = format!("--crate-name and #[crate_name] are \
let msg = format!("`--crate-name` and `#[crate_name]` are \
required to match, but `{}` != `{}`",
s, name);
sess.span_err(attr.span, &msg);

View File

@ -1,6 +1,6 @@
// compile-flags: --crate-name foo
#![crate_name = "bar"]
//~^ ERROR: --crate-name and #[crate_name] are required to match, but `foo` != `bar`
//~^ ERROR: `--crate-name` and `#[crate_name]` are required to match, but `foo` != `bar`
fn main() {}

View File

@ -1,4 +1,4 @@
error: --crate-name and #[crate_name] are required to match, but `foo` != `bar`
error: `--crate-name` and `#[crate_name]` are required to match, but `foo` != `bar`
--> $DIR/crate-name-mismatch.rs:3:1
|
LL | #![crate_name = "bar"]

View File

@ -4,7 +4,7 @@ error: entry symbol `main` defined multiple times
LL | fn main(){}
| ^^^^^^^^^^^
|
= help: did you use #[no_mangle] on `fn main`? Use #[start] instead
= help: did you use `#[no_mangle]` on `fn main`? Use `#[start]` instead
error: aborting due to previous error