Skip to content

Commit 6386d8f

Browse files
committed
---
yaml --- r: 94598 b: refs/heads/try c: d503fff h: refs/heads/master v: v3
1 parent 4b5d9cb commit 6386d8f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
5-
refs/heads/try: a1ee3810b82e4947d872c6d74c9d246fe4d2853d
5+
refs/heads/try: d503fff28ef8498e9e4ba9fb36f63f6905e882a7
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/resolve.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ struct Module {
455455
// Whether this module is populated. If not populated, any attempt to
456456
// access the children must be preceded with a
457457
// `populate_module_if_necessary` call.
458-
populated: bool,
458+
populated: Cell<bool>,
459459
}
460460

461461
impl Module {
@@ -477,7 +477,7 @@ impl Module {
477477
import_resolutions: @mut HashMap::new(),
478478
glob_count: 0,
479479
resolved_import_count: 0,
480-
populated: !external,
480+
populated: Cell::new(!external),
481481
}
482482
}
483483

@@ -1887,16 +1887,16 @@ impl Resolver {
18871887
child_ident,
18881888
visibility)
18891889
});
1890-
module.populated = true
1890+
module.populated.set(true)
18911891
}
18921892

18931893
/// Ensures that the reduced graph rooted at the given external module
18941894
/// is built, building it if it is not.
18951895
fn populate_module_if_necessary(&mut self, module: @mut Module) {
1896-
if !module.populated {
1896+
if !module.populated.get() {
18971897
self.populate_external_module(module)
18981898
}
1899-
assert!(module.populated)
1899+
assert!(module.populated.get())
19001900
}
19011901

19021902
/// Builds the reduced graph rooted at the 'use' directive for an external

0 commit comments

Comments
 (0)