Skip to content

Commit ada2684

Browse files
authored
Rollup merge of #62478 - fakenine:normalize_use_of_backticks_compiler_messages_p3, r=Centril
normalize use of backticks for compiler messages in librustc_codegen #60532
2 parents b0062ca + 8aa9f18 commit ada2684

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

src/librustc_codegen_llvm/asm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ fn inline_asm_call(
146146
unsafe {
147147
// Ask LLVM to verify that the constraints are well-formed.
148148
let constraints_ok = llvm::LLVMRustInlineAsmVerify(fty, cons.as_ptr());
149-
debug!("Constraint verification result: {:?}", constraints_ok);
149+
debug!("constraint verification result: {:?}", constraints_ok);
150150
if constraints_ok {
151151
let v = llvm::LLVMRustInlineAsm(
152152
fty,

src/librustc_codegen_llvm/builder.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
215215
funclet: Option<&Funclet<'ll>>,
216216
) -> &'ll Value {
217217

218-
debug!("Invoke {:?} with args ({:?})",
218+
debug!("invoke {:?} with args ({:?})",
219219
llfn,
220220
args);
221221

@@ -1035,7 +1035,7 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
10351035
funclet: Option<&Funclet<'ll>>,
10361036
) -> &'ll Value {
10371037

1038-
debug!("Call {:?} with args ({:?})",
1038+
debug!("call {:?} with args ({:?})",
10391039
llfn,
10401040
args);
10411041

@@ -1238,7 +1238,7 @@ impl Builder<'a, 'll, 'tcx> {
12381238
if dest_ptr_ty == stored_ptr_ty {
12391239
ptr
12401240
} else {
1241-
debug!("Type mismatch in store. \
1241+
debug!("type mismatch in store. \
12421242
Expected {:?}, got {:?}; inserting bitcast",
12431243
dest_ptr_ty, stored_ptr_ty);
12441244
self.bitcast(ptr, stored_ptr_ty)
@@ -1274,7 +1274,7 @@ impl Builder<'a, 'll, 'tcx> {
12741274
.map(|(i, (expected_ty, &actual_val))| {
12751275
let actual_ty = self.val_ty(actual_val);
12761276
if expected_ty != actual_ty {
1277-
debug!("Type mismatch in function call of {:?}. \
1277+
debug!("type mismatch in function call of {:?}. \
12781278
Expected {:?} for param {}, got {:?}; injecting bitcast",
12791279
llfn, expected_ty, i, actual_ty);
12801280
self.bitcast(actual_val, expected_ty)

src/librustc_codegen_ssa/base.rs

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

src/librustc_codegen_ssa/mir/place.rs

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

src/librustc_codegen_utils/link.rs

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

src/test/ui/crate-name-mismatch.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// compile-flags: --crate-name foo
22

33
#![crate_name = "bar"]
4-
//~^ ERROR: --crate-name and #[crate_name] are required to match, but `foo` != `bar`
4+
//~^ ERROR: `--crate-name` and `#[crate_name]` are required to match, but `foo` != `bar`
55

66
fn main() {}

src/test/ui/crate-name-mismatch.stderr

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

src/test/ui/duplicate/dupe-symbols-7.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: entry symbol `main` defined multiple times
44
LL | fn main(){}
55
| ^^^^^^^^^^^
66
|
7-
= help: did you use #[no_mangle] on `fn main`? Use #[start] instead
7+
= help: did you use `#[no_mangle]` on `fn main`? Use `#[start]` instead
88

99
error: aborting due to previous error
1010

0 commit comments

Comments
 (0)