---

yaml
---
r: 227133
b: refs/heads/auto
c: 8e24091
h: refs/heads/master
i:
  227131: 03a6e68
v: v3

Author: elinorbgr

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 751675938edef0e904086b29dc4d15bdaf519a41
+refs/heads/auto: 8e24091f98675390620172ba25fbfbbea87d150b
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/librustc_resolve/build_reduced_graph.rs

@@ -928,7 +928,7 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
         self.unresolved_imports += 1;
 
         if is_public {
-            module_.pub_count.set(module_.pub_count.get() + 1);
+            module_.inc_pub_count();
         }
 
         // Bump the reference count on the name. Or, if this is a glob, set
@@ -963,9 +963,9 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
                 // Set the glob flag. This tells us that we don't know the
                 // module's exports ahead of time.
 
-                module_.glob_count.set(module_.glob_count.get() + 1);
+                module_.inc_glob_count();
                 if is_public {
-                    module_.pub_glob_count.set(module_.pub_glob_count.get() + 1);
+                    module_.inc_pub_glob_count();
                 }
             }
         }

branches/auto/src/librustc_resolve/lib.rs

@@ -749,6 +749,30 @@ impl Module {
     }
 }
 
+impl Module {
+    pub fn inc_glob_count(&self) {
+        self.glob_count.set(self.glob_count.get() + 1);
+    }
+    pub fn dec_glob_count(&self) {
+        assert!(self.glob_count.get() > 0);
+        self.glob_count.set(self.glob_count.get() - 1);
+    }
+    pub fn inc_pub_count(&self) {
+        self.pub_count.set(self.pub_count.get() + 1);
+    }
+    pub fn dec_pub_count(&self) {
+        assert!(self.pub_count.get() > 0);
+        self.pub_count.set(self.pub_count.get() - 1);
+    }
+    pub fn inc_pub_glob_count(&self) {
+        self.pub_glob_count.set(self.pub_glob_count.get() + 1);
+    }
+    pub fn dec_pub_glob_count(&self) {
+        assert!(self.pub_glob_count.get() > 0);
+        self.pub_glob_count.set(self.pub_glob_count.get() - 1);
+    }
+}
+
 impl fmt::Debug for Module {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "{:?}, kind: {:?}, {}",

branches/auto/src/librustc_resolve/resolve_imports.rs

@@ -407,20 +407,17 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
         if resolution_result.success() {
             match import_directive.subclass {
                 GlobImport => {
-                    assert!(module_.glob_count.get() >= 1);
-                    module_.glob_count.set(module_.glob_count.get() - 1);
+                    module_.dec_glob_count();
                     if import_directive.is_public {
-                        assert!(module_.pub_glob_count.get() >= 1);
-                        module_.pub_glob_count.set(module_.pub_glob_count.get() - 1);
+                        module_.dec_pub_glob_count();
                     }
                 }
                 SingleImport(..) => {
                     // Ignore.
                 }
             }
             if import_directive.is_public {
-                assert!(module_.pub_count.get() >= 1);
-                module_.pub_count.set(module_.pub_count.get() - 1);
+                module_.dec_pub_count();
             }
         }