use hashmap, not indexvec, for expressions in TypeInference

crates/red_knot_python_semantic/src/types/infer.rs

@@ -3,11 +3,10 @@ use salsa;
 
 use red_knot_module_resolver::{resolve_module, ModuleName};
 use ruff_db::files::File;
-use ruff_index::IndexVec;
 use ruff_python_ast as ast;
 use ruff_python_ast::{ExprContext, TypeParams};
 
-use crate::semantic_index::ast_ids::{HasScopedUseId, ScopedExpressionId};
+use crate::semantic_index::ast_ids::{HasScopedAstId, HasScopedUseId, ScopedExpressionId};
 use crate::semantic_index::definition::{Definition, DefinitionKind};
 use crate::semantic_index::expression::Expression;
 use crate::semantic_index::symbol::{NodeWithScopeRef, ScopeId};
@@ -72,7 +71,7 @@ pub(crate) enum InferenceRegion<'db> {
 #[derive(Debug, Eq, PartialEq, Default, Clone)]
 pub(crate) struct TypeInference<'db> {
     /// The types of every expression in this region.
-    expressions: IndexVec<ScopedExpressionId, Type<'db>>,
+    expressions: FxHashMap<ScopedExpressionId, Type<'db>>,
 
     /// The types of every definition in this region.
     definitions: FxHashMap<Definition<'db>, Type<'db>>,
@@ -81,7 +80,7 @@ pub(crate) struct TypeInference<'db> {
 impl<'db> TypeInference<'db> {
     #[allow(unused)]
     pub(crate) fn expression_ty(&self, expression: ScopedExpressionId) -> Type<'db> {
-        self.expressions[expression]
+        self.expressions[&expression]
     }
 
     pub(crate) fn definition_ty(&self, definition: Definition<'db>) -> Type<'db> {
@@ -518,7 +517,8 @@ impl<'db> TypeInferenceBuilder<'db> {
             _ => todo!("expression type resolution for {:?}", expression),
         };
 
-        self.types.expressions.push(ty);
+        let expr_id = expression.scoped_ast_id(self.db, self.scope);
+        self.types.expressions.insert(expr_id, ty);
 
         ty
     }