Skip to content

Commit fd2862a

Browse files
committed
---
yaml --- r: 12445 b: refs/heads/master c: 891dc84 h: refs/heads/master i: 12443: 07938a6 v: v3
1 parent 5f8529d commit fd2862a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: db7a1f7b0cf7348eb8fddb552849f66bb8bdeb27
2+
refs/heads/master: 891dc84be28639b659e332ab007894b3032f9ce8
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/resolve.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,8 @@ fn visit_local_with_scope(e: @env, loc: @local, sc:scopes, v:vt<scopes>) {
647647
// 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 an enum that's in scope",
650+
#fmt("declaration of `%s` shadows an \
651+
enum that's in scope",
651652
path_to_ident(an_ident)));
652653
}
653654
_ {}

0 commit comments

Comments
 (0)