Moving to new Salsa version using query-group repo (DRAFT)

This is a WIP
* Using an updated version of query-group to better support lifetimes.
* Embedded query-group in cairo-lang-proc-macros.
* cairo-lang-proc-macro's derive debug with db now supprots generics better.
* Using salsa::Update on non salsa structs to get the db to work correctly.
* Moved some SmolStr and Arc<str> to use be interned for salsa::Update support.
* Implemented Ord for SmolStrId to have BTreeMap's salsa::Update work.
* Removing upcasting and 'static where applicable

* Upgraded cairo-lang-debug by:
    1. saying Db has the salsa::Database trait
    2. making Dummy in test not use shortid
    3. Debug with Db can make some trouble but using .long where needed fixes it.
* cairo-lang-utils:
    1 .The short_id macro is not really needed so I gutted it and have short_id double interned
    1.1. I made short_id have a single long field that is returned by ref.
    2. Implemented salsa::Update for OrderedHashMap.
    3. Implemented salsa::Update for OrderedHashSet.
    4. Added an as_intern_id and from_intern_id using asid and fromid
    5. No need for upcast to be static
* cairo-lang-filesystem
    1. Removed all interned valued from input.
    2. Updated code with lifetimes to better support <'db> interned values.
    3. Tests needed updating as set methods are a bit more tricky now with lifetimes.
    4. Added utility function for setting input values with using lifetimed objects.
    5. Added macro_rules! to set_crate_config and override_file_content so they still accept a short id.
* cairo-lang-syntax:
    * Updated all code to use lifetimes.
    * Updated all code to use the new query-group.
    * Updated codegen.
    * Updated ast.
* cairo-lang-diagnostics:
    * Updated all code to use lifetimes.
    * Updated all code to use the new query-group.
* cairo-lang-parser:
    * Updated all code to use lifetimes.
    * Updated all code to use the new query-group.
    * Removed the references to empty data structs as they are no longer needed.
    * Using long to turn StrId into a ref for the parser.
* cairo-lang-sierra
    * No need for internkey (as query group will use #[salsa::interned] instead)
* cairo-lang-defs
    * Added lifetime to db
    * Added lifetime to diagnostic_utils
    * Added lifetime to ids
    * Fixing macros in ids to support lifetimes
    * Using self.long(db) instead of lookup_intern to get a ref with a 'db lifetime
    * Change from Arc<[T]> to Arc<Vec<T>> which allows for salsa::Update.
    * Tests to use macro_rules! to get lifetimes right.
    * Updated tests to work with all the changes
    * Fixed debug print formatting.

commit-id:9e4ac020

Author: eytan-starkware

Cargo.lock

@@ -18,7 +18,7 @@ opt-level = 3
 [profile.ci-dev.package."bimap"]
 
 opt-level = 3
-[profile.ci-dev.package."rust-analyzer-salsa"]
+[profile.ci-dev.package."salsa"]
 opt-level = 3
 
 [workspace]
@@ -101,7 +101,9 @@ derivative = "2.2.0"
 diffy = "0.4.2"
 env_logger = "0.11.6"
 genco = "0.17.10"
-good_lp = { version = "1.11.0", features = ["minilp"], default-features = false }
+good_lp = { version = "1.11.0", features = [
+    "minilp",
+], default-features = false }
 hashbrown = "0.15.2"
 id-arena = "2.2.1"
 ignore = "0.4.23"
@@ -125,10 +127,13 @@ quote = "1.0.38"
 rand = "0.9.0"
 rayon = "1.10.0"
 rstest = "0.25.0"
-salsa = { package = "rust-analyzer-salsa", version = "0.17.0-pre.6" }
+salsa = "0.22.0"
 schemars = { version = "0.8.21", features = ["preserve_order"] }
 semver = { version = "1.0.25", features = ["serde"] }
-serde = { version = "1.0.217", default-features = false, features = ["derive","rc"] }
+serde = { version = "1.0.217", default-features = false, features = [
+    "derive",
+    "rc",
+] }
 serde_json = "1.0.138"
 typetag = "0.2"
 sha2 = "0.10.8"

Cargo.toml

@@ -8,9 +8,9 @@ description = "Debug utilities for query objects."
 
 [dependencies]
 cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.11.4" }
+salsa.workspace = true
 
 [dev-dependencies]
-cairo-lang-proc-macros = { path = "../cairo-lang-proc-macros"}
+cairo-lang-proc-macros = { path = "../cairo-lang-proc-macros" }
 env_logger.workspace = true
-salsa.workspace = true
 test-log.workspace = true

crates/cairo-lang-debug/Cargo.toml

@@ -228,6 +228,8 @@ pub mod helper {
     use std::fmt;
     use std::marker::PhantomData;
 
+    use salsa::Database;
+
     use super::{DebugWith, DebugWithDb};
 
     pub trait Fallback<T: fmt::Debug, Db: ?Sized> {
@@ -238,12 +240,12 @@ pub mod helper {
 
     pub struct HelperDebug<T, Db: ?Sized>(PhantomData<T>, PhantomData<Db>);
 
-    impl<T: DebugWithDb<Db>, Db: ?Sized> HelperDebug<T, Db> {
+    impl<T: DebugWithDb<Db>, Db: Database + ?Sized> HelperDebug<T, Db> {
         #[allow(dead_code)]
         pub fn helper_debug<'a, 'b: 'a>(a: &'a T, db: &'b Db) -> DebugWith<'a, Db> {
             a.debug(db)
         }
     }
 
-    impl<Everything, Db: ?Sized, T: fmt::Debug> Fallback<T, Db> for Everything {}
+    impl<Everything, Db: Database + ?Sized, T: fmt::Debug> Fallback<T, Db> for Everything {}
 }

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

@@ -1,43 +1,46 @@
-use std::fmt::Debug;
-
 use cairo_lang_proc_macros::DebugWithDb;
-use cairo_lang_utils::{Intern, Upcast, define_short_id};
+use cairo_lang_utils::Upcast;
+use salsa::{Database, Storage};
 use test_log::test;
 
-use crate::debug as cairo_lang_debug;
 use crate::debug::DebugWithDb;
 
 // Test database query group.
-#[salsa::query_group(TestDatabase)]
-trait TestGroup {
-    #[salsa::interned]
-    fn intern_b(&self, crt: DummyLongId) -> DummyShortId;
+#[cairo_lang_proc_macros::query_group]
+trait TestGroup: salsa::Database {}
+
+// Structs.
+#[salsa::interned]
+struct Dummy {
+    id: usize,
 }
-// Database impl.
-#[salsa::database(TestDatabase)]
-#[derive(Default)]
-pub struct DatabaseForTesting {
-    storage: salsa::Storage<DatabaseForTesting>,
+
+#[salsa::db]
+#[derive(Clone, Default)]
+struct DummyDb {
+    storage: Storage<Self>,
 }
-impl salsa::Database for DatabaseForTesting {}
 
-impl Upcast<dyn TestGroup> for DatabaseForTesting {
-    fn upcast(&self) -> &(dyn TestGroup + 'static) {
-        self
+#[salsa::db]
+impl Database for DummyDb {}
+
+impl<T: Database + ?Sized> DebugWithDb<T> for Dummy<'_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>, db: &T) -> std::fmt::Result {
+        write!(f, "Dummy({})", self.id(db))
     }
 }
 
-// Structs.
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-struct DummyLongId(usize);
-
-define_short_id!(DummyShortId, DummyLongId, TestGroup, lookup_intern_b, intern_b);
+impl Upcast<dyn TestGroup> for DummyDb {
+    fn upcast(&self) -> &dyn TestGroup {
+        self
+    }
+}
 
 #[derive(DebugWithDb)]
-#[debug_db(dyn TestGroup + 'static)]
-struct ComplexStruct {
+#[debug_db(dyn TestGroup)]
+struct ComplexStruct<'db> {
     a: Option<usize>,
-    b: DummyShortId,
+    b: Dummy<'db>,
     #[hide_field_debug_with_db]
     c: usize,
     #[hide_field_debug_with_db]
@@ -46,7 +49,8 @@ struct ComplexStruct {
 
 #[test]
 fn test_debug() {
-    let db = DatabaseForTesting::default();
-    let a = ComplexStruct { a: Some(5), b: DummyLongId(6).intern(&db), c: 7, d: 8 };
-    assert_eq!(format!("{:?}", a.debug(&db)), "ComplexStruct { a: Some(5), b: DummyLongId(6) }");
+    let db = DummyDb::default();
+    let db_ref: &dyn TestGroup = &db;
+    let a = ComplexStruct { a: Some(5), b: Dummy::new(db_ref, 6), c: 7, d: 8 };
+    assert_eq!(format!("{:?}", a.debug(&db_ref)), "ComplexStruct { a: Some(5), b: Dummy(6) }");
 }

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

@@ -13,6 +13,7 @@ cairo-lang-filesystem = { path = "../cairo-lang-filesystem", version = "~2.11.4"
 cairo-lang-parser = { path = "../cairo-lang-parser", version = "~2.11.4" }
 cairo-lang-syntax = { path = "../cairo-lang-syntax", version = "~2.11.4" }
 cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.11.4" }
+cairo-lang-proc-macros = { path = "../cairo-lang-proc-macros", version = "~2.11.4" }
 itertools = { workspace = true, default-features = true }
 salsa.workspace = true
 serde = { workspace = true, default-features = true }
@@ -22,7 +23,9 @@ bincode.workspace = true
 xxhash-rust.workspace = true
 
 [dev-dependencies]
-cairo-lang-test-utils = { path = "../cairo-lang-test-utils", features = ["testing"] }
+cairo-lang-test-utils = { path = "../cairo-lang-test-utils", features = [
+    "testing",
+] }
 env_logger.workspace = true
 indoc.workspace = true
 pretty_assertions.workspace = true