Skip to content

Commit 52610c3

Browse files
author
Lenny222
committed
more back-ticks, less colons
1 parent fdf601e commit 52610c3

17 files changed

+34
-34
lines changed

‎src/librustc/middle/resolve.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ pub impl Resolver {
10071007
let ns = namespace_for_duplicate_checking_mode(
10081008
duplicate_checking_mode);
10091009
self.session.span_err(sp,
1010-
fmt!("duplicate definition of %s %s",
1010+
fmt!("duplicate definition of %s `%s`",
10111011
namespace_to_str(ns),
10121012
*self.session.str_of(name)));
10131013
for child.span_for_namespace(ns).each |sp| {
@@ -1959,7 +1959,7 @@ pub impl Resolver {
19591959
match self.resolve_import_for_module(module, import_directive) {
19601960
Failed => {
19611961
// We presumably emitted an error. Continue.
1962-
let msg = fmt!("failed to resolve import: %s",
1962+
let msg = fmt!("failed to resolve import `%s`",
19631963
*self.import_path_to_str(
19641964
import_directive.module_path,
19651965
*import_directive.subclass));
@@ -2488,7 +2488,7 @@ pub impl Resolver {
24882488
self.session.span_err(span {lo: span.lo, hi: span.lo +
24892489
BytePos(str::len(*segment_name)), expn_info:
24902490
span.expn_info}, fmt!("unresolved import. maybe \
2491-
a missing 'extern mod %s'?",
2491+
a missing `extern mod %s`?",
24922492
*segment_name));
24932493
return Failed;
24942494
}
@@ -2511,7 +2511,7 @@ pub impl Resolver {
25112511
// Not a module.
25122512
self.session.span_err(span,
25132513
fmt!("not a \
2514-
module: %s",
2514+
module `%s`",
25152515
*self.session.
25162516
str_of(
25172517
name)));
@@ -2525,7 +2525,7 @@ pub impl Resolver {
25252525
None => {
25262526
// There are no type bindings at all.
25272527
self.session.span_err(span,
2528-
fmt!("not a module: %s",
2528+
fmt!("not a module `%s`",
25292529
*self.session.str_of(
25302530
name)));
25312531
return Failed;
@@ -2976,7 +2976,7 @@ pub impl Resolver {
29762976
}
29772977

29782978
// We're out of luck.
2979-
debug!("(resolving name in module) failed to resolve %s",
2979+
debug!("(resolving name in module) failed to resolve `%s`",
29802980
*self.session.str_of(name));
29812981
return Failed;
29822982
}
@@ -4158,7 +4158,7 @@ pub impl Resolver {
41584158
// in the same disjunct, which is an
41594159
// error
41604160
self.session.span_err(pattern.span,
4161-
fmt!("Identifier %s is bound more \
4161+
fmt!("Identifier `%s` is bound more \
41624162
than once in the same pattern",
41634163
path_to_str(path, self.session
41644164
.intr())));
@@ -4199,7 +4199,7 @@ pub impl Resolver {
41994199
Some(_) => {
42004200
self.session.span_err(
42014201
path.span,
4202-
fmt!("not an enum variant or constant: %s",
4202+
fmt!("`%s` is not an enum variant or constant",
42034203
*self.session.str_of(
42044204
*path.idents.last())));
42054205
}
@@ -4227,7 +4227,7 @@ pub impl Resolver {
42274227
Some(_) => {
42284228
self.session.span_err(
42294229
path.span,
4230-
fmt!("not an enum variant, struct or const: %s",
4230+
fmt!("`%s` is not an enum variant, struct or const",
42314231
*self.session.str_of(
42324232
*path.idents.last())));
42334233
}
@@ -4723,8 +4723,8 @@ pub impl Resolver {
47234723
path.idents);
47244724
if self.name_exists_in_scope_struct(wrong_name) {
47254725
self.session.span_err(expr.span,
4726-
fmt!("unresolved name: `%s`. \
4727-
Did you mean: `self.%s`?",
4726+
fmt!("unresolved name `%s`. \
4727+
Did you mean `self.%s`?",
47284728
wrong_name,
47294729
wrong_name));
47304730
}
@@ -4734,13 +4734,13 @@ pub impl Resolver {
47344734
match self.find_best_match_for_name(wrong_name, 5) {
47354735
Some(m) => {
47364736
self.session.span_err(expr.span,
4737-
fmt!("unresolved name: `%s`. \
4738-
Did you mean: `%s`?",
4737+
fmt!("unresolved name `%s`. \
4738+
Did you mean `%s`?",
47394739
wrong_name, m));
47404740
}
47414741
None => {
47424742
self.session.span_err(expr.span,
4743-
fmt!("unresolved name: `%s`.",
4743+
fmt!("unresolved name `%s`.",
47444744
wrong_name));
47454745
}
47464746
}

‎src/test/compile-fail/alt-join.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ fn my_fail() -> ! { fail!(); }
1616
fn main() {
1717
match true { false => { my_fail(); } true => { } }
1818

19-
debug!(x); //~ ERROR unresolved name: `x`.
19+
debug!(x); //~ ERROR unresolved name `x`.
2020
let x: int;
2121
}

‎src/test/compile-fail/bad-expr-path.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// error-pattern: unresolved name: `m1::a`. Did you mean: `args`?
11+
// error-pattern: unresolved name `m1::a`. Did you mean `args`?
1212

1313
mod m1 {}
1414

‎src/test/compile-fail/bad-expr-path2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// error-pattern: unresolved name: `m1::a`. Did you mean: `args`?
11+
// error-pattern: unresolved name `m1::a`. Did you mean `args`?
1212

1313
mod m1 {
1414
pub mod a {}

‎src/test/compile-fail/does-nothing.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// error-pattern: unresolved name: `this_does_nothing_what_the`.
1+
// error-pattern: unresolved name `this_does_nothing_what_the`.
22
fn main() { debug!("doing"); this_does_nothing_what_the; debug!("boing"); }

‎src/test/compile-fail/issue-1476.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
// except according to those terms.
1010

1111
fn main() {
12-
error!(x); //~ ERROR unresolved name: `x`.
12+
error!(x); //~ ERROR unresolved name `x`.
1313
}

‎src/test/compile-fail/issue-2281-part1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// error-pattern: unresolved name: `foobar`.
11+
// error-pattern: unresolved name `foobar`.
1212

1313
fn main(args: ~[str]) { debug!(foobar); }

‎src/test/compile-fail/issue-3021-b.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fn siphash(k0 : u64) {
1919
pub impl siphash {
2020
fn reset(&mut self) {
2121
self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR attempted dynamic environment-capture
22-
//~^ ERROR unresolved name: `k0`.
22+
//~^ ERROR unresolved name `k0`.
2323
}
2424
}
2525
}

‎src/test/compile-fail/issue-3021-d.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ fn siphash(k0 : u64, k1 : u64) -> siphash {
3131
impl siphash for SipState {
3232
fn reset(&self) {
3333
self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR attempted dynamic environment-capture
34-
//~^ ERROR unresolved name: `k0`.
34+
//~^ ERROR unresolved name `k0`.
3535
self.v1 = k1 ^ 0x646f72616e646f6d; //~ ERROR attempted dynamic environment-capture
36-
//~^ ERROR unresolved name: `k1`.
36+
//~^ ERROR unresolved name `k1`.
3737
}
3838
fn result(&self) -> u64 { return mk_result(self); }
3939
}

‎src/test/compile-fail/issue-3021.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fn siphash(k0 : u64) -> SipHash {
2222
impl SipHash for SipState {
2323
fn reset(&self) {
2424
self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR attempted dynamic environment-capture
25-
//~^ ERROR unresolved name: `k0`.
25+
//~^ ERROR unresolved name `k0`.
2626
}
2727
}
2828
fail!();

‎src/test/compile-fail/issue-3038.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ fn main()
2020

2121
let _z = match g(1, 2) {
2222
g(x, x) => { debug!(x + x); }
23-
//~^ ERROR Identifier x is bound more than once in the same pattern
23+
//~^ ERROR Identifier `x` is bound more than once in the same pattern
2424
};
2525

2626
let _z = match i(l(1, 2), m(3, 4)) {
27-
i(l(x, _), m(_, x)) //~ ERROR Identifier x is bound more than once in the same pattern
27+
i(l(x, _), m(_, x)) //~ ERROR Identifier `x` is bound more than once in the same pattern
2828
=> { error!(x + x); }
2929
};
3030

3131
let _z = match (1, 2) {
32-
(x, x) => { x } //~ ERROR Identifier x is bound more than once in the same pattern
32+
(x, x) => { x } //~ ERROR Identifier `x` is bound more than once in the same pattern
3333
};
3434

3535
}

‎src/test/compile-fail/issue-3099-a.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010

1111
enum a { b, c }
1212

13-
enum a { d, e } //~ ERROR duplicate definition of type a
13+
enum a { d, e } //~ ERROR duplicate definition of type `a`
1414

1515
fn main() {}

‎src/test/compile-fail/issue-3099-b.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010

1111
pub mod a {}
1212

13-
pub mod a {} //~ ERROR duplicate definition of type a
13+
pub mod a {} //~ ERROR duplicate definition of type `a`
1414

1515
fn main() {}

‎src/test/compile-fail/issue-3099.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fn a(x: ~str) -> ~str {
1212
fmt!("First function with %s", x)
1313
}
1414

15-
fn a(x: ~str, y: ~str) -> ~str { //~ ERROR duplicate definition of value a
15+
fn a(x: ~str, y: ~str) -> ~str { //~ ERROR duplicate definition of value `a`
1616
fmt!("Second function with %s and %s", x, y)
1717
}
1818

‎src/test/compile-fail/issue-4265.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ impl Foo {
1717
Foo { baz: 0 }.bar();
1818
}
1919

20-
fn bar() { //~ ERROR duplicate definition of value bar
20+
fn bar() { //~ ERROR duplicate definition of value `bar`
2121
}
2222
}
2323

‎src/test/compile-fail/issue-4366.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ mod a {
2525
}
2626
pub mod sub {
2727
use a::b::*;
28-
fn sub() -> bar { foo(); 1 } //~ ERROR: unresolved name: `foo`
28+
fn sub() -> bar { foo(); 1 } //~ ERROR: unresolved name `foo`
2929
//~^ ERROR: use of undeclared type name `bar`
3030
}
3131
}
@@ -35,5 +35,5 @@ mod m1 {
3535
}
3636

3737
fn main() {
38-
foo(); //~ ERROR: unresolved name: `foo`
38+
foo(); //~ ERROR: unresolved name `foo`
3939
}

‎src/test/compile-fail/test-cfg.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
fn foo() {}
1515

1616
fn main() {
17-
foo(); //~ ERROR unresolved name: `foo`.
17+
foo(); //~ ERROR unresolved name `foo`.
1818
}

0 commit comments

Comments
 (0)