From 8ffbd814afd5bcb0534eef7d69af8df3a641d3ec Mon Sep 17 00:00:00 2001
From: Camille GILLOT <gillot.camille@gmail.com>
Date: Wed, 15 Jun 2022 19:41:41 +0200
Subject: [PATCH] Update next_node_id.

---
 compiler/rustc_ast_lowering/src/lib.rs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs
index d56b2fd5d0b..ec1a48a91c5 100644
--- a/compiler/rustc_ast_lowering/src/lib.rs
+++ b/compiler/rustc_ast_lowering/src/lib.rs
@@ -496,13 +496,10 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
     }
 
     fn next_node_id(&mut self) -> NodeId {
-        let next = self
-            .next_node_id
-            .as_usize()
-            .checked_add(1)
-            .expect("input too large; ran out of NodeIds");
-        self.next_node_id = NodeId::from_usize(next);
-        self.next_node_id
+        let start = self.next_node_id;
+        let next = start.as_u32().checked_add(1).expect("input too large; ran out of NodeIds");
+        self.next_node_id = ast::NodeId::from_u32(next);
+        start
     }
 
     fn opt_local_def_id(&self, node: NodeId) -> Option<LocalDefId> {