Skip to content

Commit a834d76

Browse files
committed
---
yaml --- r: 21639 b: refs/heads/snap-stage3 c: 31af60b h: refs/heads/master i: 21637: 43ee62a 21635: 4e9e0fb 21631: 1f24feb v: v3
1 parent e54e948 commit a834d76

File tree

3 files changed

+1
-16
lines changed

3 files changed

+1
-16
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: f7681f9236168cfad661b0ad73798a2d54a941f1
4+
refs/heads/snap-stage3: 31af60b257983da1a77336ee033406350eb14ee9
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/rustc/middle/resolve.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4159,11 +4159,6 @@ struct Resolver {
41594159
xray) {
41604160
NoNameDefinition => {
41614161
// We failed to resolve the name. Report an error.
4162-
self.session.span_err(
4163-
path.span,
4164-
fmt!("unresolved name: %s::%s",
4165-
self.atoms_to_str((*module_path_atoms).get()),
4166-
self.session.str_of(name)));
41674162
return None;
41684163
}
41694164
ChildNameDefinition(def) | ImportNameDefinition(def) => {
@@ -4212,11 +4207,6 @@ struct Resolver {
42124207
xray) {
42134208
NoNameDefinition => {
42144209
// We failed to resolve the name. Report an error.
4215-
self.session.span_err(
4216-
path.span,
4217-
fmt!("unresolved name: %s::%s", self.atoms_to_str(
4218-
(*module_path_atoms).get()),
4219-
self.session.str_of(name)));
42204210
return None;
42214211
}
42224212
ChildNameDefinition(def) | ImportNameDefinition(def) => {

branches/snap-stage3/src/test/compile-fail/private-item-simple.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
// xfail-test
2-
// xfail-fast
3-
4-
// This is xfail'd because two errors are reported instead of one.
5-
61
mod a {
72
priv fn f() {}
83
}

0 commit comments

Comments
 (0)