From 43a74051c7b699e2df66122cfcf074aaf144a4fe Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Mon, 4 Nov 2019 08:22:52 -0500 Subject: [PATCH] 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. --- src/librustc_resolve/lib.rs | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 94b4418c16a2..e94b544582e8 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 {