Skip to content

Commit 8155152

Browse files
committed
---
yaml --- r: 15449 b: refs/heads/try c: e740985 h: refs/heads/master i: 15447: eab6586 v: v3
1 parent f89177f commit 8155152

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: d7ba59eb6e4b9ff99e94b0ca9c06ad47968c67ea
5+
refs/heads/try: e7409859ce9227d8f66f6de797502418ef6c3ccd
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/resolve.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -644,10 +644,10 @@ fn visit_local_with_scope(e: @env, loc: @local, sc:scopes, v:vt<scopes>) {
644644
alt lookup_in_scope(*e, sc, loc.span, path_to_ident(an_ident),
645645
ns_val, false) {
646646
some(ast::def_variant(enum_id,variant_id)) {
647-
// Declaration shadows a enum that's in scope.
647+
// Declaration shadows an enum that's in scope.
648648
// That's an error.
649649
e.sess.span_err(loc.span,
650-
#fmt("declaration of `%s` shadows a enum that's in scope",
650+
#fmt("declaration of `%s` shadows an enum that's in scope",
651651
path_to_ident(an_ident)));
652652
}
653653
_ {}

0 commit comments

Comments
 (0)