Skip to content

Commit 5a63b21

Browse files
lkuperlkuper
committed
More consistent use of backticks and "expected" in error messages.
Got some of the debug messages, here, too. I figure it doesn't hurt to get used to doing this even in places where users won't ever see it.
1 parent 07a81ad commit 5a63b21

29 files changed

+102
-98
lines changed

‎src/libstd/json.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ impl parser for parser {
405405
alt self.ch {
406406
',' { self.bump(); }
407407
']' { self.bump(); ret ok(list(@values)); }
408-
_ { ret self.error("expecting ',' or ']'"); }
408+
_ { ret self.error("expected `,` or `]`"); }
409409
}
410410
};
411411
}
@@ -437,7 +437,7 @@ impl parser for parser {
437437

438438
if self.ch != ':' {
439439
if self.eof() { break; }
440-
ret self.error("expecting ':'");
440+
ret self.error("expected `:`");
441441
}
442442
self.bump();
443443

@@ -452,7 +452,7 @@ impl parser for parser {
452452
'}' { self.bump(); ret ok(dict(values)); }
453453
_ {
454454
if self.eof() { break; }
455-
ret self.error("expecting ',' or '}'");
455+
ret self.error("expected `,` or `}`");
456456
}
457457
}
458458
}
@@ -797,7 +797,7 @@ mod tests {
797797
assert from_str("[1,]") ==
798798
err({line: 1u, col: 4u, msg: @"invalid syntax"});
799799
assert from_str("[6 7]") ==
800-
err({line: 1u, col: 4u, msg: @"expecting ',' or ']'"});
800+
err({line: 1u, col: 4u, msg: @"expected `,` or `]`"});
801801

802802
assert from_str("[]") == ok(list(@~[]));
803803
assert from_str("[ ]") == ok(list(@~[]));
@@ -826,13 +826,13 @@ mod tests {
826826
err({line: 1u, col: 6u, msg: @"EOF while parsing object"});
827827

828828
assert from_str("{\"a\" 1") ==
829-
err({line: 1u, col: 6u, msg: @"expecting ':'"});
829+
err({line: 1u, col: 6u, msg: @"expected `:`"});
830830
assert from_str("{\"a\":") ==
831831
err({line: 1u, col: 6u, msg: @"EOF while parsing value"});
832832
assert from_str("{\"a\":1") ==
833833
err({line: 1u, col: 7u, msg: @"EOF while parsing object"});
834834
assert from_str("{\"a\":1 1") ==
835-
err({line: 1u, col: 8u, msg: @"expecting ',' or '}'"});
835+
err({line: 1u, col: 8u, msg: @"expected `,` or `}`"});
836836
assert from_str("{\"a\":1,") ==
837837
err({line: 1u, col: 8u, msg: @"EOF while parsing object"});
838838

‎src/libsyntax/parse/common.rs

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,23 @@ impl parser_common for parser {
2828
fn unexpected_last(t: token::token) -> ! {
2929
self.span_fatal(
3030
copy self.last_span,
31-
"unexpected token: '" + token_to_str(self.reader, t) + "'");
31+
"unexpected token: `" + token_to_str(self.reader, t) + "`");
3232
}
3333

3434
fn unexpected() -> ! {
35-
self.fatal("unexpected token: '"
36-
+ token_to_str(self.reader, self.token) + "'");
35+
self.fatal("unexpected token: `"
36+
+ token_to_str(self.reader, self.token) + "`");
3737
}
3838

3939
fn expect(t: token::token) {
4040
if self.token == t {
4141
self.bump();
4242
} else {
43-
let mut s: str = "expecting '";
43+
let mut s: str = "expected `";
4444
s += token_to_str(self.reader, t);
45-
s += "' but found '";
45+
s += "` but found `";
4646
s += token_to_str(self.reader, self.token);
47-
self.fatal(s + "'");
47+
self.fatal(s + "`");
4848
}
4949
}
5050

@@ -53,8 +53,9 @@ impl parser_common for parser {
5353
token::IDENT(i, _) { self.bump(); ret self.get_str(i); }
5454
token::ACTUALLY(token::w_ident(*)) { self.bug(
5555
"ident interpolation not converted to real token"); }
56-
_ { self.fatal("expecting ident, found "
57-
+ token_to_str(self.reader, self.token)); }
56+
_ { self.fatal("expected ident, found `"
57+
+ token_to_str(self.reader, self.token)
58+
+ "`"); }
5859
}
5960
}
6061

@@ -121,8 +122,9 @@ impl parser_common for parser {
121122
fn expect_keyword(word: str) {
122123
self.require_keyword(word);
123124
if !self.eat_keyword(word) {
124-
self.fatal("expecting " + word + ", found " +
125-
token_to_str(self.reader, self.token));
125+
self.fatal("expected `" + word + "`, found `" +
126+
token_to_str(self.reader, self.token) +
127+
"`");
126128
}
127129
}
128130

@@ -152,10 +154,11 @@ impl parser_common for parser {
152154
} else if self.token == token::BINOP(token::SHR) {
153155
self.swap(token::GT, self.span.lo + 1u, self.span.hi);
154156
} else {
155-
let mut s: str = "expecting ";
157+
let mut s: str = "expected `";
156158
s += token_to_str(self.reader, token::GT);
157-
s += ", found ";
159+
s += "`, found `";
158160
s += token_to_str(self.reader, self.token);
161+
s += "`";
159162
self.fatal(s);
160163
}
161164
}

‎src/libsyntax/parse/parser.rs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ class parser {
311311
vis: public})
312312
}
313313

314-
_ { self.fatal("expected ';' or '}` \
314+
_ { self.fatal("expected `;` or `}` \
315315
but found `"
316316
+ token_to_str(self.reader, self.token) + "`");
317317
}
@@ -545,7 +545,7 @@ class parser {
545545
} else if self.token == token::MOD_SEP || is_ident(self.token) {
546546
let path = self.parse_path_with_tps(colons_before_params);
547547
ty_path(path, self.get_id())
548-
} else { self.fatal("expecting type"); };
548+
} else { self.fatal("expected type"); };
549549

550550
let sp = mk_sp(lo, self.last_span.hi);
551551
ret @{id: self.get_id(),
@@ -1176,7 +1176,7 @@ class parser {
11761176
self.bump();
11771177
ret (some(sep), zerok);
11781178
} else {
1179-
self.fatal("expected '*' or '+'");
1179+
self.fatal("expected `*` or `+`");
11801180
}
11811181
}
11821182
}
@@ -1709,8 +1709,9 @@ class parser {
17091709
if self.token == token::UNDERSCORE {
17101710
self.bump();
17111711
if self.token != token::RBRACE {
1712-
self.fatal("expecting }, found " +
1713-
token_to_str(self.reader, self.token));
1712+
self.fatal("expected `}`, found `" +
1713+
token_to_str(self.reader, self.token) +
1714+
"`");
17141715
}
17151716
etc = true;
17161717
break;
@@ -1855,7 +1856,7 @@ class parser {
18551856
is_mutbl = class_mutable;
18561857
}
18571858
if !is_plain_ident(self.token) {
1858-
self.fatal("expecting ident");
1859+
self.fatal("expected ident");
18591860
}
18601861
let name = self.parse_ident();
18611862
self.expect(token::COLON);
@@ -2000,9 +2001,9 @@ class parser {
20002001
}
20012002
t {
20022003
if classify::stmt_ends_with_semi(*stmt) {
2003-
self.fatal("expected ';' or '}' after expression \
2004-
but found '"
2005-
+ token_to_str(self.reader, t) + "'");
2004+
self.fatal("expected `;` or `}` after expression \
2005+
but found `"
2006+
+ token_to_str(self.reader, t) + "`");
20062007
}
20072008
vec::push(stmts, stmt);
20082009
}
@@ -2363,8 +2364,8 @@ class parser {
23632364
alt self.parse_item(attrs, vis) {
23642365
some(i) { vec::push(items, i); }
23652366
_ {
2366-
self.fatal("expected item but found '" +
2367-
token_to_str(self.reader, self.token) + "'");
2367+
self.fatal("expected item but found `" +
2368+
token_to_str(self.reader, self.token) + "`");
23682369
}
23692370
}
23702371
#debug["parse_mod_items: attrs=%?", attrs];

‎src/rustc/back/link.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ fn build_link_meta(sess: session, c: ast::crate, output: str,
357357

358358
fn warn_missing(sess: session, name: str, default: str) {
359359
if !sess.building_library { ret; }
360-
sess.warn(#fmt["missing crate link meta '%s', using '%s' as default",
360+
sess.warn(#fmt["missing crate link meta `%s`, using `%s` as default",
361361
name, default]);
362362
}
363363

@@ -371,7 +371,7 @@ fn build_link_meta(sess: session, c: ast::crate, output: str,
371371
let mut os =
372372
str::split_char(path::basename(output), '.');
373373
if (vec::len(os) < 2u) {
374-
sess.fatal(#fmt("output file name %s doesn't\
374+
sess.fatal(#fmt("output file name `%s` doesn't\
375375
appear to have an extension", output));
376376
}
377377
vec::pop(os);
@@ -680,7 +680,7 @@ fn link_binary(sess: session,
680680
// We run 'cc' here
681681
let prog = run::program_output(cc_prog, cc_args);
682682
if 0 != prog.status {
683-
sess.err(#fmt["linking with %s failed with code %d",
683+
sess.err(#fmt["linking with `%s` failed with code %d",
684684
cc_prog, prog.status]);
685685
sess.note(#fmt["%s arguments: %s",
686686
cc_prog, str::connect(cc_args, " ")]);
@@ -696,7 +696,7 @@ fn link_binary(sess: session,
696696
// Remove the temporary object file if we aren't saving temps
697697
if !sess.opts.save_temps {
698698
if ! os::remove_file(obj_filename) {
699-
sess.warn(#fmt["failed to delete object file '%s'",
699+
sess.warn(#fmt["failed to delete object file `%s`",
700700
obj_filename]);
701701
}
702702
}

‎src/rustc/metadata/loader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fn load_library_crate(cx: ctxt) -> {ident: str, data: @~[u8]} {
4141
some(t) { ret t; }
4242
none {
4343
cx.diag.span_fatal(
44-
cx.span, #fmt["can't find crate for '%s'", *cx.ident]);
44+
cx.span, #fmt["can't find crate for `%s`", *cx.ident]);
4545
}
4646
}
4747
}

‎src/rustc/middle/capture.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ fn check_capture_clause(tcx: ty::ctxt,
4343
if !vec::any(*freevars, |fv| fv.def == cap_def ) {
4444
tcx.sess.span_warn(
4545
cap_item.span,
46-
#fmt("captured variable '%s' not used in closure",
46+
#fmt("captured variable `%s` not used in closure",
4747
*cap_item.name));
4848
}
4949

5050
let cap_def_id = ast_util::def_id_of_def(cap_def).node;
5151
if !seen_defs.insert(cap_def_id, ()) {
5252
tcx.sess.span_err(
5353
cap_item.span,
54-
#fmt("variable '%s' captured more than once",
54+
#fmt("variable `%s` captured more than once",
5555
*cap_item.name));
5656
}
5757
}

‎src/rustc/middle/lint.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ fn get_lint_dict() -> lint_dict {
127127
("vecs_not_implicitly_copyable",
128128
@{lint: vecs_not_implicitly_copyable,
129129
desc: "make vecs and strs not implicitly copyable\
130-
('err' is ignored; only checked at top level",
130+
(`err` is ignored; only checked at top level",
131131
default: warn}),
132132

133133
("implicit_copies",
@@ -223,7 +223,7 @@ impl methods for ctxt {
223223
self.span_lint(
224224
self.get_level(unrecognized_warning),
225225
meta.span,
226-
#fmt("unknown warning: '%s'", name));
226+
#fmt("unknown warning: `%s`", name));
227227
}
228228
(_, some((lint, new_level))) {
229229
// we do multiple unneeded copies of the map

0 commit comments

Comments
 (0)