Merge pull request rust-lang#20757 from Shourya742/force-fileid-invariant-to-interner

Veykril · web-flow · commit 082ecd8f73ad · 2025-10-16T07:37:06.000Z
Use FileId::MAX for id assertion in PathInterner::intern
diff --git a/src/tools/rust-analyzer/crates/vfs/src/path_interner.rs b/src/tools/rust-analyzer/crates/vfs/src/path_interner.rs
@@ -28,7 +28,7 @@ impl PathInterner {
     /// - Else, returns a newly allocated id.
     pub(crate) fn intern(&mut self, path: VfsPath) -> FileId {
         let (id, _added) = self.map.insert_full(path);
-        assert!(id < u32::MAX as usize);
+        assert!(id < FileId::MAX as usize);
         FileId(id as u32)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ impl PathInterner {`
`28`	`28`	`/// - Else, returns a newly allocated id.`
`29`	`29`	`pub(crate) fn intern(&mut self, path: VfsPath) -> FileId {`
`30`	`30`	`let (id, _added) = self.map.insert_full(path);`
`31`		`- assert!(id < u32::MAX as usize);`
	`31`	`+ assert!(id < FileId::MAX as usize);`
`32`	`32`	`FileId(id as u32)`
`33`	`33`	`}`
`34`	`34`