Rename salsa-2022 to salsa

Cargo.toml

@@ -0,0 +1,32 @@
+[package]
+name = "salsa"
+version = "0.18.0"
+authors = ["Salsa developers"]
+edition = "2021"
+license = "Apache-2.0 OR MIT"
+repository = "https://github.com/salsa-rs/salsa"
+description = "A generic framework for on-demand, incrementalized computation (experimental)"
+
+[dependencies]
+crossbeam = "0.8.1"
+dashmap = "5.3.4"
+rustc-hash = "1.1.0"
+indexmap = "2"
+hashlink = "0.8.0"
+arc-swap = "1.6.0"
+crossbeam-utils = { version = "0.8", default-features = false }
+log = "0.4.5"
+parking_lot = "0.12.1"
+smallvec = "1.0.0"
+salsa-macros = { path = "components/salsa-macros" }
+
+[dev-dependencies]
+expect-test = "1.4.0"
+parking_lot = "0.12.1"
+test-log = "0.2.11"
+env_logger = "*"
+trybuild = "1.0"
+rustversion = "1.0"
+
+[workspace]
+members = ["components/salsa-macros"]

components/salsa-2022/Cargo.toml

@@ -1,19 +0,0 @@
-[package]
-name = "salsa-2022"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-crossbeam = "0.8.1"
-dashmap = "5.3.4"
-rustc-hash = "1.1.0"
-indexmap = "2"
-hashlink = "0.8.0"
-arc-swap = "1.6.0"
-crossbeam-utils = { version = "0.8", default-features = false }
-log = "0.4.5"
-parking_lot = "0.12.1"
-smallvec = "1.0.0"
-salsa-2022-macros = { path = "../salsa-2022-macros" }

components/salsa-macros/Cargo.toml

@@ -1,7 +1,11 @@
 [package]
-name = "salsa-2022-macros"
-version = "0.1.0"
+name = "salsa-macros"
+version = "0.18.0"
+authors = ["Salsa developers"]
 edition = "2021"
+license = "Apache-2.0 OR MIT"
+repository = "https://github.com/salsa-rs/salsa"
+description = "Procedural macros for the salsa crate"
 
 [lib]
 proc-macro = true

salsa-2022-tests/Cargo.toml

@@ -1,15 +0,0 @@
-[package]
-name = "salsa-2022-tests"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-salsa = { path = "../components/salsa-2022", package = "salsa-2022" }
-expect-test = "1.4.0"
-parking_lot = "0.12.1"
-test-log = "0.2.11"
-env_logger = "*"
-trybuild = "1.0"
-rustversion = "1.0"

src/lib.rs

@@ -43,11 +43,11 @@ pub use self::routes::IngredientIndex;
 pub use self::runtime::Runtime;
 pub use self::storage::DbWithJar;
 pub use self::storage::Storage;
-pub use salsa_2022_macros::accumulator;
-pub use salsa_2022_macros::db;
-pub use salsa_2022_macros::input;
-pub use salsa_2022_macros::interned;
-pub use salsa_2022_macros::jar;
-pub use salsa_2022_macros::tracked;
-pub use salsa_2022_macros::DebugWithDb;
-pub use salsa_2022_macros::Update;
+pub use salsa_macros::accumulator;
+pub use salsa_macros::db;
+pub use salsa_macros::input;
+pub use salsa_macros::interned;
+pub use salsa_macros::jar;
+pub use salsa_macros::tracked;
+pub use salsa_macros::DebugWithDb;
+pub use salsa_macros::Update;

tests/accumulate-from-tracked-fn.rs

@@ -2,7 +2,8 @@
 //! Then mutate the values so that the tracked function re-executes.
 //! Check that we accumulate the appropriate, new values.
 
-use salsa_2022_tests::{HasLogger, Logger};
+mod common;
+use common::{HasLogger, Logger};
 
 use expect_test::expect;
 use test_log::test;

tests/accumulate-reuse-workaround.rs

@@ -2,7 +2,8 @@
 //! `accumulated` in a tracked function to get better
 //! reuse.
 
-use salsa_2022_tests::{HasLogger, Logger};
+mod common;
+use common::{HasLogger, Logger};
 
 use expect_test::expect;
 use test_log::test;

tests/accumulate-reuse.rs

@@ -3,7 +3,8 @@
 //! Tests behavior when a query's only inputs
 //! are the accumulated values from another query.
 
-use salsa_2022_tests::{HasLogger, Logger};
+mod common;
+use common::{HasLogger, Logger};
 
 use expect_test::expect;
 use test_log::test;

tests/accumulate.rs

@@ -2,7 +2,8 @@
 //!
 //! * entities not created in a revision are deleted, as is any memoized data keyed on them.
 
-use salsa_2022_tests::{HasLogger, Logger};
+mod common;
+use common::{HasLogger, Logger};
 
 use expect_test::expect;
 use test_log::test;

tests/common/mod.rs

@@ -1,4 +1,7 @@
-/// Utility for tests that lets us log when notable events happen.
+//! Utility for tests that lets us log when notable events happen.
+
+#![allow(dead_code)]
+
 #[derive(Default)]
 pub struct Logger {
     logs: std::sync::Mutex<Vec<String>>,