Skip to content

Commit 1282ca4

Browse files
committed
---
yaml --- r: 229318 b: refs/heads/try c: 3d041bd h: refs/heads/master v: v3
1 parent 03f3323 commit 1282ca4

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
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: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: 8e24091f98675390620172ba25fbfbbea87d150b
4+
refs/heads/try: 3d041bd46dfbd77a392228b6e4c0cb866d4404fc
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/test/run-pass/issue-4865-2.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// Previously, this would have failed to resolve due to the circular
12+
// block between `use say` and `pub use hello::*`.
13+
//
14+
// Now, as `use say` is not `pub`, the glob import can resolve
15+
// without any problem and this resolves fine.
16+
1117
pub use hello::*;
1218

1319
pub mod say {

branches/try/src/test/run-pass/issue-4865-3.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// This should resolve fine even with the circular imports as
12+
// they are not `pub`.
13+
1114
pub mod a {
12-
use b::*;
15+
use b::*;
1316
}
1417

1518
pub mod b {
16-
use a::*;
19+
use a::*;
1720
}
1821

1922
use a::*;

0 commit comments

Comments
 (0)