Skip to content

Commit b8035a1

Browse files
committed
---
yaml --- r: 227134 b: refs/heads/auto c: 3d041bd h: refs/heads/master v: v3
1 parent 6ea0627 commit b8035a1

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
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: 8e24091f98675390620172ba25fbfbbea87d150b
11+
refs/heads/auto: 3d041bd46dfbd77a392228b6e4c0cb866d4404fc
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

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