about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2019-11-04 08:22:52 -0500
committerMark Rousskov <mark.simulacrum@gmail.com>2019-11-09 11:10:13 -0500
commit43a74051c7b699e2df66122cfcf074aaf144a4fe (patch)
tree1a342ad3f1c8e236c4ef135ccadc3265aebe1345
parentdd6df0d20ed94b46125e7b2039205674f01c95b9 (diff)
Inline reserve_node_ids
This function was only ever called with 1 so there's little point in it;
this isn't an expensive operation (essentially a checked add) so we're
not really "reserving" anything either.
-rw-r--r--src/librustc_resolve/lib.rs18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 94b4418c16a..e94b544582e 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -1236,20 +1236,12 @@ impl<'a> Resolver<'a> {
         }
     }
 
-    pub fn reserve_node_ids(&mut self, count: usize) -> ast::NodeId {
-        let id = self.next_node_id;
-
-        match id.as_usize().checked_add(count) {
-            Some(next) => {
-                self.next_node_id = ast::NodeId::from_usize(next);
-            }
-            None => panic!("input too large; ran out of node-IDs!"),
-        }
-
-        id
-    }
     pub fn next_node_id(&mut self) -> NodeId {
-        self.reserve_node_ids(1)
+        let next = self.next_node_id.as_usize()
+            .checked_add(1)
+            .expect("input too large; ran out of NodeIds");
+        self.next_node_id = ast::NodeId::from_usize(next);
+        self.next_node_id
     }
 
     pub fn lint_buffer(&mut self) -> &mut lint::LintBuffer {