Skip to content

Commit 9d8bedb

Browse files
committed
---
yaml --- r: 233195 b: refs/heads/beta c: 3d041bd h: refs/heads/master i: 233193: 0435264 233191: 4bc6dac v: v3
1 parent 8e0adb9 commit 9d8bedb

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
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 8e24091f98675390620172ba25fbfbbea87d150b
26+
refs/heads/beta: 3d041bd46dfbd77a392228b6e4c0cb866d4404fc
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/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/beta/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)