Remove Upcast trait and using DebugDbUpcast only where explicitly required. (#8505)

Author: orizi

Cargo.lock

@@ -17,7 +17,6 @@ use cairo_lang_semantic::inline_macros::get_default_plugin_suite;
 use cairo_lang_semantic::plugin::PluginSuite;
 use cairo_lang_sierra_generator::db::init_sierra_gen_group;
 use cairo_lang_sierra_generator::program_generator::get_dummy_program_for_size_estimation;
-use cairo_lang_utils::Upcast;
 use salsa::Database;
 
 use crate::InliningStrategy;
@@ -242,9 +241,3 @@ pub fn validate_corelib(db: &(dyn salsa::Database + 'static)) -> Result<()> {
     };
     bail!("Corelib version mismatch: expected `{expected}`, found `{found}`{path_part}.");
 }
-
-impl<'db> Upcast<'db, dyn Database> for RootDatabase {
-    fn upcast(&self) -> &dyn Database {
-        self
-    }
-}

crates/cairo-lang-compiler/src/db.rs

@@ -8,7 +8,6 @@ use std::hash::Hash;
 use std::rc::Rc;
 use std::sync::Arc;
 
-use cairo_lang_utils::Upcast;
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
 use cairo_lang_utils::ordered_hash_set::OrderedHashSet;
 
@@ -33,6 +32,16 @@ pub trait DebugWithDb<'db> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>, db: &'db Self::Db) -> std::fmt::Result;
 }
 
+/// A trait that allows upcasting the database to the type T.
+pub trait DebugDbUpcast<'db, T: ?Sized> {
+    fn debug_db_upcast(&'db self) -> &'db T;
+}
+impl<'db, T: ?Sized> DebugDbUpcast<'db, T> for T {
+    fn debug_db_upcast(&'db self) -> &'db T {
+        self
+    }
+}
+
 pub struct DebugWith<'me, 'db, Db: ?Sized> {
     value: BoxRef<'me, dyn DebugWithDb<'db, Db = Db> + 'me>,
     db: &'db Db,
@@ -192,11 +201,14 @@ impl<'db, A, B> DebugWithDb<'db> for (A, B)
 where
     A: DebugWithDb<'db>,
     B: DebugWithDb<'db> + 'db,
-    A::Db: Upcast<'db, B::Db>,
+    A::Db: DebugDbUpcast<'db, B::Db>,
 {
     type Db = A::Db;
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>, db: &'db Self::Db) -> std::fmt::Result {
-        f.debug_tuple("").field(&self.0.debug(db)).field(&self.1.debug(db.upcast())).finish()
+        f.debug_tuple("")
+            .field(&self.0.debug(db))
+            .field(&self.1.debug(db.debug_db_upcast()))
+            .finish()
     }
 }
 
@@ -205,15 +217,15 @@ where
     A: DebugWithDb<'db>,
     B: DebugWithDb<'db> + 'db,
     C: DebugWithDb<'db> + 'db,
-    A::Db: Upcast<'db, B::Db>,
-    A::Db: Upcast<'db, C::Db>,
+    A::Db: DebugDbUpcast<'db, B::Db>,
+    A::Db: DebugDbUpcast<'db, C::Db>,
 {
     type Db = A::Db;
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>, db: &'db Self::Db) -> std::fmt::Result {
         f.debug_tuple("")
             .field(&self.0.debug(db))
-            .field(&self.1.debug(db.upcast()))
-            .field(&self.2.debug(db.upcast()))
+            .field(&self.1.debug(db.debug_db_upcast()))
+            .field(&self.2.debug(db.debug_db_upcast()))
             .finish()
     }
 }
@@ -278,9 +290,7 @@ pub mod helper {
     use std::fmt;
     use std::marker::PhantomData;
 
-    use cairo_lang_utils::Upcast;
-
-    use super::{DebugWith, DebugWithDb};
+    use super::{DebugDbUpcast, DebugWith, DebugWithDb};
 
     pub trait Fallback<'db, T: fmt::Debug, Db: ?Sized> {
         fn helper_debug(a: &'db T, _db: &'db Db) -> &'db dyn fmt::Debug {
@@ -290,10 +300,10 @@ pub mod helper {
 
     pub struct HelperDebug<T, Db: ?Sized>(PhantomData<T>, PhantomData<Db>);
 
-    impl<'db, T: DebugWithDb<'db>, Db: ?Sized + Upcast<'db, T::Db>> HelperDebug<T, Db> {
+    impl<'db, T: DebugWithDb<'db>, Db: ?Sized + DebugDbUpcast<'db, T::Db>> HelperDebug<T, Db> {
         #[allow(dead_code)]
         pub fn helper_debug<'me>(a: &'me T, db: &'db Db) -> DebugWith<'me, 'db, T::Db> {
-            a.debug(db.upcast())
+            a.debug(db.debug_db_upcast())
         }
     }
 

crates/cairo-lang-debug/src/debug.rs

@@ -1,6 +1,5 @@
 use cairo_lang_proc_macros::DebugWithDb;
 use cairo_lang_test_utils::test;
-use cairo_lang_utils::Upcast;
 use salsa::{Database, Storage};
 
 use crate::debug::DebugWithDb;
@@ -33,24 +32,6 @@ impl<'db> DebugWithDb<'db> for Dummy<'db> {
     }
 }
 
-impl<'db> Upcast<'db, dyn TestGroup> for DummyDb {
-    fn upcast(&'db self) -> &'db dyn TestGroup {
-        self
-    }
-}
-
-impl<'db> Upcast<'db, ()> for dyn TestGroup {
-    fn upcast(&'db self) -> &'db () {
-        &()
-    }
-}
-
-impl<'db> Upcast<'db, dyn Database> for dyn TestGroup {
-    fn upcast(&'db self) -> &'db dyn Database {
-        self
-    }
-}
-
 #[derive(DebugWithDb)]
 #[debug_db(dyn Database)]
 struct ComplexStruct<'db> {

crates/cairo-lang-debug/src/debug_test.rs

@@ -11,7 +11,7 @@ use cairo_lang_syntax::node::kind::SyntaxKind;
 use cairo_lang_syntax::node::{SyntaxNode, Terminal, TypedSyntaxNode, ast};
 use cairo_lang_test_utils::parse_test_file::TestRunnerResult;
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
-use cairo_lang_utils::{Intern, Upcast, extract_matches, try_extract_matches};
+use cairo_lang_utils::{Intern, extract_matches, try_extract_matches};
 use indoc::indoc;
 use salsa::{Database, Setter};
 
@@ -46,11 +46,6 @@ impl Default for DatabaseForTesting {
         res
     }
 }
-impl<'db> Upcast<'db, dyn Database> for DatabaseForTesting {
-    fn upcast(&'db self) -> &'db dyn Database {
-        self
-    }
-}
 
 cairo_lang_test_utils::test_file_test!(
     defs,

crates/cairo-lang-defs/src/test.rs

@@ -10,7 +10,7 @@ use cairo_lang_filesystem::{override_file_content, set_crate_config};
 use cairo_lang_parser::db::ParserGroup;
 use cairo_lang_semantic::db::{PluginSuiteInput, init_semantic_group};
 use cairo_lang_semantic::plugin::PluginSuite;
-use cairo_lang_utils::{Intern, Upcast};
+use cairo_lang_utils::Intern;
 use salsa::Database;
 
 #[salsa::db]
@@ -45,12 +45,6 @@ impl TestDatabase {
     }
 }
 
-impl<'db> Upcast<'db, dyn Database> for TestDatabase {
-    fn upcast(&self) -> &dyn Database {
-        self
-    }
-}
-
 pub fn setup_test_module(db: &mut dyn Database, content: &str) {
     let crate_id = test_crate_id(db);
     let directory = Directory::Real("src".into());

crates/cairo-lang-doc/src/tests/test_utils.rs

@@ -6,9 +6,9 @@ use cairo_lang_semantic::usage::MemberPath;
 use cairo_lang_semantic::{self as semantic, Expr, Statement, StatementId};
 use cairo_lang_syntax::node::TypedStablePtr;
 use cairo_lang_test_utils::parse_test_file::TestRunnerResult;
+use cairo_lang_utils::extract_matches;
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
 use cairo_lang_utils::unordered_hash_set::UnorderedHashSet;
-use cairo_lang_utils::{Upcast, extract_matches};
 use itertools::Itertools;
 
 use super::block_builder::{BlockBuilder, merge_block_builders};
@@ -80,7 +80,7 @@ fn test_merge_block_builders(
         .map(|_| ctx.new_var(VarRequest { ty: unit_ty(ctx.db), location: dummy_location }))
         .collect();
 
-    let expr_formatter = ExprFormatter { db: db.upcast(), function_id: test_function.function_id };
+    let expr_formatter = ExprFormatter { db: &db, function_id: test_function.function_id };
 
     let input_blocks = create_block_builders(&mut ctx, &test_function, &lowering_vars);
     let input_blocks_str =
@@ -89,7 +89,7 @@ fn test_merge_block_builders(
     // Invoke [merge_block_builders] on the input blocks.
     let merged_block = merge_block_builders(&mut ctx, input_blocks, dummy_location);
 
-    let lowered_formatter = LoweredFormatter::new(db.upcast(), &ctx.variables.variables);
+    let lowered_formatter = LoweredFormatter::new(&db, &ctx.variables.variables);
     let lowered_blocks = ctx.blocks.build().unwrap();
     let lowered_str = lowered_blocks
         .iter()

crates/cairo-lang-lowering/src/lower/block_builder_test.rs

@@ -6,7 +6,6 @@ use cairo_lang_filesystem::db::{init_dev_corelib, init_files_group};
 use cairo_lang_filesystem::detect::detect_corelib;
 use cairo_lang_semantic::db::{PluginSuiteInput, init_semantic_group};
 use cairo_lang_semantic::inline_macros::get_default_plugin_suite;
-use cairo_lang_utils::Upcast;
 use salsa::Database;
 
 use crate::Lowered;
@@ -52,12 +51,6 @@ impl Default for LoweringDatabaseForTesting {
     }
 }
 
-impl<'db> Upcast<'db, dyn Database> for LoweringDatabaseForTesting {
-    fn upcast(&self) -> &dyn Database {
-        self
-    }
-}
-
 /// Helper for formatting a lowered representation for tests.
 pub fn formatted_lowered(db: &dyn Database, lowered: Option<&Lowered<'_>>) -> String {
     match lowered {

crates/cairo-lang-lowering/src/test_utils.rs

@@ -7,7 +7,7 @@ use cairo_lang_filesystem::span::{TextOffset, TextWidth};
 use cairo_lang_primitive_token::{PrimitiveToken, ToPrimitiveTokenStream};
 use cairo_lang_syntax::node::ast::SyntaxFile;
 use cairo_lang_syntax::node::{SyntaxNode, TypedSyntaxNode};
-use cairo_lang_utils::{Intern, Upcast};
+use cairo_lang_utils::Intern;
 use itertools::chain;
 
 use crate::ParserDiagnostic;
@@ -29,12 +29,6 @@ impl Default for SimpleParserDatabase {
     }
 }
 
-impl<'db> Upcast<'db, dyn salsa::Database> for SimpleParserDatabase {
-    fn upcast(&'db self) -> &'db dyn salsa::Database {
-        self
-    }
-}
-
 impl SimpleParserDatabase {
     /// Parses new file and returns its syntax root.
     ///

crates/cairo-lang-parser/src/utils.rs

@@ -19,8 +19,8 @@ use cairo_lang_syntax::node::helpers::QueryAttrs;
 use cairo_lang_syntax::node::{TypedSyntaxNode, ast};
 use cairo_lang_test_utils::parse_test_file::TestRunnerResult;
 use cairo_lang_test_utils::verify_diagnostics_expectation;
+use cairo_lang_utils::Intern;
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
-use cairo_lang_utils::{Intern, Upcast};
 use itertools::{Itertools, chain};
 use salsa::{AsDynDatabase, Database, Setter};
 
@@ -70,11 +70,6 @@ impl Default for DatabaseForTesting {
         res
     }
 }
-impl<'db> Upcast<'db, dyn Database> for DatabaseForTesting {
-    fn upcast(&'db self) -> &'db dyn Database {
-        self
-    }
-}
 
 /// Tests expansion of given code, with only the default plugins.
 pub fn test_expand_plugin(