diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 000000000..ee39217e8 --- /dev/null +++ b/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"] diff --git a/components/salsa-2022/Cargo.toml b/components/salsa-2022/Cargo.toml deleted file mode 100644 index f179a6bda..000000000 --- a/components/salsa-2022/Cargo.toml +++ /dev/null @@ -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" } diff --git a/components/salsa-2022-macros/Cargo.toml b/components/salsa-macros/Cargo.toml similarity index 51% rename from components/salsa-2022-macros/Cargo.toml rename to components/salsa-macros/Cargo.toml index 990ff5a42..5aa058044 100644 --- a/components/salsa-2022-macros/Cargo.toml +++ b/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 diff --git a/components/salsa-2022-macros/src/accumulator.rs b/components/salsa-macros/src/accumulator.rs similarity index 100% rename from components/salsa-2022-macros/src/accumulator.rs rename to components/salsa-macros/src/accumulator.rs diff --git a/components/salsa-2022-macros/src/configuration.rs b/components/salsa-macros/src/configuration.rs similarity index 100% rename from components/salsa-2022-macros/src/configuration.rs rename to components/salsa-macros/src/configuration.rs diff --git a/components/salsa-2022-macros/src/db.rs b/components/salsa-macros/src/db.rs similarity index 100% rename from components/salsa-2022-macros/src/db.rs rename to components/salsa-macros/src/db.rs diff --git a/components/salsa-2022-macros/src/db_lifetime.rs b/components/salsa-macros/src/db_lifetime.rs similarity index 100% rename from components/salsa-2022-macros/src/db_lifetime.rs rename to components/salsa-macros/src/db_lifetime.rs diff --git a/components/salsa-2022-macros/src/debug.rs b/components/salsa-macros/src/debug.rs similarity index 100% rename from components/salsa-2022-macros/src/debug.rs rename to components/salsa-macros/src/debug.rs diff --git a/components/salsa-2022-macros/src/debug_with_db.rs b/components/salsa-macros/src/debug_with_db.rs similarity index 100% rename from components/salsa-2022-macros/src/debug_with_db.rs rename to components/salsa-macros/src/debug_with_db.rs diff --git a/components/salsa-2022-macros/src/input.rs b/components/salsa-macros/src/input.rs similarity index 100% rename from components/salsa-2022-macros/src/input.rs rename to components/salsa-macros/src/input.rs diff --git a/components/salsa-2022-macros/src/interned.rs b/components/salsa-macros/src/interned.rs similarity index 100% rename from components/salsa-2022-macros/src/interned.rs rename to components/salsa-macros/src/interned.rs diff --git a/components/salsa-2022-macros/src/jar.rs b/components/salsa-macros/src/jar.rs similarity index 100% rename from components/salsa-2022-macros/src/jar.rs rename to components/salsa-macros/src/jar.rs diff --git a/components/salsa-2022-macros/src/lib.rs b/components/salsa-macros/src/lib.rs similarity index 100% rename from components/salsa-2022-macros/src/lib.rs rename to components/salsa-macros/src/lib.rs diff --git a/components/salsa-2022-macros/src/options.rs b/components/salsa-macros/src/options.rs similarity index 100% rename from components/salsa-2022-macros/src/options.rs rename to components/salsa-macros/src/options.rs diff --git a/components/salsa-2022-macros/src/salsa_struct.rs b/components/salsa-macros/src/salsa_struct.rs similarity index 100% rename from components/salsa-2022-macros/src/salsa_struct.rs rename to components/salsa-macros/src/salsa_struct.rs diff --git a/components/salsa-2022-macros/src/tracked.rs b/components/salsa-macros/src/tracked.rs similarity index 100% rename from components/salsa-2022-macros/src/tracked.rs rename to components/salsa-macros/src/tracked.rs diff --git a/components/salsa-2022-macros/src/tracked_fn.rs b/components/salsa-macros/src/tracked_fn.rs similarity index 100% rename from components/salsa-2022-macros/src/tracked_fn.rs rename to components/salsa-macros/src/tracked_fn.rs diff --git a/components/salsa-2022-macros/src/tracked_struct.rs b/components/salsa-macros/src/tracked_struct.rs similarity index 100% rename from components/salsa-2022-macros/src/tracked_struct.rs rename to components/salsa-macros/src/tracked_struct.rs diff --git a/components/salsa-2022-macros/src/update.rs b/components/salsa-macros/src/update.rs similarity index 100% rename from components/salsa-2022-macros/src/update.rs rename to components/salsa-macros/src/update.rs diff --git a/components/salsa-2022-macros/src/xform.rs b/components/salsa-macros/src/xform.rs similarity index 100% rename from components/salsa-2022-macros/src/xform.rs rename to components/salsa-macros/src/xform.rs diff --git a/examples-2022/calc/Cargo.toml b/examples/calc/Cargo.toml similarity index 100% rename from examples-2022/calc/Cargo.toml rename to examples/calc/Cargo.toml diff --git a/examples-2022/calc/src/compile.rs b/examples/calc/src/compile.rs similarity index 100% rename from examples-2022/calc/src/compile.rs rename to examples/calc/src/compile.rs diff --git a/examples-2022/calc/src/db.rs b/examples/calc/src/db.rs similarity index 100% rename from examples-2022/calc/src/db.rs rename to examples/calc/src/db.rs diff --git a/examples-2022/calc/src/ir.rs b/examples/calc/src/ir.rs similarity index 100% rename from examples-2022/calc/src/ir.rs rename to examples/calc/src/ir.rs diff --git a/examples-2022/calc/src/main.rs b/examples/calc/src/main.rs similarity index 100% rename from examples-2022/calc/src/main.rs rename to examples/calc/src/main.rs diff --git a/examples-2022/calc/src/parser.rs b/examples/calc/src/parser.rs similarity index 100% rename from examples-2022/calc/src/parser.rs rename to examples/calc/src/parser.rs diff --git a/examples-2022/calc/src/type_check.rs b/examples/calc/src/type_check.rs similarity index 100% rename from examples-2022/calc/src/type_check.rs rename to examples/calc/src/type_check.rs diff --git a/examples-2022/lazy-input/Cargo.toml b/examples/lazy-input/Cargo.toml similarity index 100% rename from examples-2022/lazy-input/Cargo.toml rename to examples/lazy-input/Cargo.toml diff --git a/examples-2022/lazy-input/inputs/a b/examples/lazy-input/inputs/a similarity index 100% rename from examples-2022/lazy-input/inputs/a rename to examples/lazy-input/inputs/a diff --git a/examples-2022/lazy-input/inputs/aa b/examples/lazy-input/inputs/aa similarity index 100% rename from examples-2022/lazy-input/inputs/aa rename to examples/lazy-input/inputs/aa diff --git a/examples-2022/lazy-input/inputs/b b/examples/lazy-input/inputs/b similarity index 100% rename from examples-2022/lazy-input/inputs/b rename to examples/lazy-input/inputs/b diff --git a/examples-2022/lazy-input/inputs/start b/examples/lazy-input/inputs/start similarity index 100% rename from examples-2022/lazy-input/inputs/start rename to examples/lazy-input/inputs/start diff --git a/examples-2022/lazy-input/src/main.rs b/examples/lazy-input/src/main.rs similarity index 100% rename from examples-2022/lazy-input/src/main.rs rename to examples/lazy-input/src/main.rs diff --git a/salsa-2022-tests/Cargo.toml b/salsa-2022-tests/Cargo.toml deleted file mode 100644 index 6ac555cd1..000000000 --- a/salsa-2022-tests/Cargo.toml +++ /dev/null @@ -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" diff --git a/components/salsa-2022/src/accumulator.rs b/src/accumulator.rs similarity index 100% rename from components/salsa-2022/src/accumulator.rs rename to src/accumulator.rs diff --git a/components/salsa-2022/src/alloc.rs b/src/alloc.rs similarity index 100% rename from components/salsa-2022/src/alloc.rs rename to src/alloc.rs diff --git a/components/salsa-2022/src/cancelled.rs b/src/cancelled.rs similarity index 100% rename from components/salsa-2022/src/cancelled.rs rename to src/cancelled.rs diff --git a/components/salsa-2022/src/cycle.rs b/src/cycle.rs similarity index 100% rename from components/salsa-2022/src/cycle.rs rename to src/cycle.rs diff --git a/components/salsa-2022/src/database.rs b/src/database.rs similarity index 100% rename from components/salsa-2022/src/database.rs rename to src/database.rs diff --git a/components/salsa-2022/src/debug.rs b/src/debug.rs similarity index 100% rename from components/salsa-2022/src/debug.rs rename to src/debug.rs diff --git a/components/salsa-2022/src/durability.rs b/src/durability.rs similarity index 100% rename from components/salsa-2022/src/durability.rs rename to src/durability.rs diff --git a/components/salsa-2022/src/event.rs b/src/event.rs similarity index 100% rename from components/salsa-2022/src/event.rs rename to src/event.rs diff --git a/components/salsa-2022/src/function.rs b/src/function.rs similarity index 100% rename from components/salsa-2022/src/function.rs rename to src/function.rs diff --git a/components/salsa-2022/src/function/accumulated.rs b/src/function/accumulated.rs similarity index 100% rename from components/salsa-2022/src/function/accumulated.rs rename to src/function/accumulated.rs diff --git a/components/salsa-2022/src/function/backdate.rs b/src/function/backdate.rs similarity index 100% rename from components/salsa-2022/src/function/backdate.rs rename to src/function/backdate.rs diff --git a/components/salsa-2022/src/function/delete.rs b/src/function/delete.rs similarity index 100% rename from components/salsa-2022/src/function/delete.rs rename to src/function/delete.rs diff --git a/components/salsa-2022/src/function/diff_outputs.rs b/src/function/diff_outputs.rs similarity index 100% rename from components/salsa-2022/src/function/diff_outputs.rs rename to src/function/diff_outputs.rs diff --git a/components/salsa-2022/src/function/execute.rs b/src/function/execute.rs similarity index 100% rename from components/salsa-2022/src/function/execute.rs rename to src/function/execute.rs diff --git a/components/salsa-2022/src/function/fetch.rs b/src/function/fetch.rs similarity index 100% rename from components/salsa-2022/src/function/fetch.rs rename to src/function/fetch.rs diff --git a/components/salsa-2022/src/function/inputs.rs b/src/function/inputs.rs similarity index 100% rename from components/salsa-2022/src/function/inputs.rs rename to src/function/inputs.rs diff --git a/components/salsa-2022/src/function/lru.rs b/src/function/lru.rs similarity index 100% rename from components/salsa-2022/src/function/lru.rs rename to src/function/lru.rs diff --git a/components/salsa-2022/src/function/maybe_changed_after.rs b/src/function/maybe_changed_after.rs similarity index 100% rename from components/salsa-2022/src/function/maybe_changed_after.rs rename to src/function/maybe_changed_after.rs diff --git a/components/salsa-2022/src/function/memo.rs b/src/function/memo.rs similarity index 100% rename from components/salsa-2022/src/function/memo.rs rename to src/function/memo.rs diff --git a/components/salsa-2022/src/function/specify.rs b/src/function/specify.rs similarity index 100% rename from components/salsa-2022/src/function/specify.rs rename to src/function/specify.rs diff --git a/components/salsa-2022/src/function/store.rs b/src/function/store.rs similarity index 100% rename from components/salsa-2022/src/function/store.rs rename to src/function/store.rs diff --git a/components/salsa-2022/src/function/sync.rs b/src/function/sync.rs similarity index 100% rename from components/salsa-2022/src/function/sync.rs rename to src/function/sync.rs diff --git a/components/salsa-2022/src/hash.rs b/src/hash.rs similarity index 100% rename from components/salsa-2022/src/hash.rs rename to src/hash.rs diff --git a/components/salsa-2022/src/id.rs b/src/id.rs similarity index 100% rename from components/salsa-2022/src/id.rs rename to src/id.rs diff --git a/components/salsa-2022/src/ingredient.rs b/src/ingredient.rs similarity index 100% rename from components/salsa-2022/src/ingredient.rs rename to src/ingredient.rs diff --git a/components/salsa-2022/src/ingredient_list.rs b/src/ingredient_list.rs similarity index 100% rename from components/salsa-2022/src/ingredient_list.rs rename to src/ingredient_list.rs diff --git a/components/salsa-2022/src/input.rs b/src/input.rs similarity index 100% rename from components/salsa-2022/src/input.rs rename to src/input.rs diff --git a/components/salsa-2022/src/input_field.rs b/src/input_field.rs similarity index 100% rename from components/salsa-2022/src/input_field.rs rename to src/input_field.rs diff --git a/components/salsa-2022/src/interned.rs b/src/interned.rs similarity index 100% rename from components/salsa-2022/src/interned.rs rename to src/interned.rs diff --git a/components/salsa-2022/src/jar.rs b/src/jar.rs similarity index 100% rename from components/salsa-2022/src/jar.rs rename to src/jar.rs diff --git a/components/salsa-2022/src/key.rs b/src/key.rs similarity index 100% rename from components/salsa-2022/src/key.rs rename to src/key.rs diff --git a/components/salsa-2022/src/lib.rs b/src/lib.rs similarity index 78% rename from components/salsa-2022/src/lib.rs rename to src/lib.rs index f0099b532..81245007f 100644 --- a/components/salsa-2022/src/lib.rs +++ b/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; diff --git a/components/salsa-2022/src/plumbing.rs b/src/plumbing.rs similarity index 100% rename from components/salsa-2022/src/plumbing.rs rename to src/plumbing.rs diff --git a/components/salsa-2022/src/revision.rs b/src/revision.rs similarity index 100% rename from components/salsa-2022/src/revision.rs rename to src/revision.rs diff --git a/components/salsa-2022/src/routes.rs b/src/routes.rs similarity index 100% rename from components/salsa-2022/src/routes.rs rename to src/routes.rs diff --git a/components/salsa-2022/src/runtime.rs b/src/runtime.rs similarity index 100% rename from components/salsa-2022/src/runtime.rs rename to src/runtime.rs diff --git a/components/salsa-2022/src/runtime/active_query.rs b/src/runtime/active_query.rs similarity index 100% rename from components/salsa-2022/src/runtime/active_query.rs rename to src/runtime/active_query.rs diff --git a/components/salsa-2022/src/runtime/dependency_graph.rs b/src/runtime/dependency_graph.rs similarity index 100% rename from components/salsa-2022/src/runtime/dependency_graph.rs rename to src/runtime/dependency_graph.rs diff --git a/components/salsa-2022/src/runtime/local_state.rs b/src/runtime/local_state.rs similarity index 100% rename from components/salsa-2022/src/runtime/local_state.rs rename to src/runtime/local_state.rs diff --git a/components/salsa-2022/src/runtime/shared_state.rs b/src/runtime/shared_state.rs similarity index 100% rename from components/salsa-2022/src/runtime/shared_state.rs rename to src/runtime/shared_state.rs diff --git a/components/salsa-2022/src/salsa_struct.rs b/src/salsa_struct.rs similarity index 100% rename from components/salsa-2022/src/salsa_struct.rs rename to src/salsa_struct.rs diff --git a/components/salsa-2022/src/setter.rs b/src/setter.rs similarity index 100% rename from components/salsa-2022/src/setter.rs rename to src/setter.rs diff --git a/components/salsa-2022/src/storage.rs b/src/storage.rs similarity index 100% rename from components/salsa-2022/src/storage.rs rename to src/storage.rs diff --git a/components/salsa-2022/src/tracked_struct.rs b/src/tracked_struct.rs similarity index 100% rename from components/salsa-2022/src/tracked_struct.rs rename to src/tracked_struct.rs diff --git a/components/salsa-2022/src/tracked_struct/struct_map.rs b/src/tracked_struct/struct_map.rs similarity index 100% rename from components/salsa-2022/src/tracked_struct/struct_map.rs rename to src/tracked_struct/struct_map.rs diff --git a/components/salsa-2022/src/tracked_struct/tracked_field.rs b/src/tracked_struct/tracked_field.rs similarity index 100% rename from components/salsa-2022/src/tracked_struct/tracked_field.rs rename to src/tracked_struct/tracked_field.rs diff --git a/components/salsa-2022/src/update.rs b/src/update.rs similarity index 100% rename from components/salsa-2022/src/update.rs rename to src/update.rs diff --git a/salsa-2022-tests/tests/accumulate-from-tracked-fn.rs b/tests/accumulate-from-tracked-fn.rs similarity index 97% rename from salsa-2022-tests/tests/accumulate-from-tracked-fn.rs rename to tests/accumulate-from-tracked-fn.rs index ae8deb48e..767b62cf7 100644 --- a/salsa-2022-tests/tests/accumulate-from-tracked-fn.rs +++ b/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; diff --git a/salsa-2022-tests/tests/accumulate-reuse-workaround.rs b/tests/accumulate-reuse-workaround.rs similarity index 97% rename from salsa-2022-tests/tests/accumulate-reuse-workaround.rs rename to tests/accumulate-reuse-workaround.rs index 4a81e85eb..8289b50f8 100644 --- a/salsa-2022-tests/tests/accumulate-reuse-workaround.rs +++ b/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; diff --git a/salsa-2022-tests/tests/accumulate-reuse.rs b/tests/accumulate-reuse.rs similarity index 97% rename from salsa-2022-tests/tests/accumulate-reuse.rs rename to tests/accumulate-reuse.rs index ca164c57a..fc333fa44 100644 --- a/salsa-2022-tests/tests/accumulate-reuse.rs +++ b/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; diff --git a/salsa-2022-tests/tests/accumulate.rs b/tests/accumulate.rs similarity index 98% rename from salsa-2022-tests/tests/accumulate.rs rename to tests/accumulate.rs index 80157ec94..cef66ea25 100644 --- a/salsa-2022-tests/tests/accumulate.rs +++ b/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; diff --git a/salsa-2022-tests/src/lib.rs b/tests/common/mod.rs similarity index 93% rename from salsa-2022-tests/src/lib.rs rename to tests/common/mod.rs index 34e96e1f9..8e5d51ef7 100644 --- a/salsa-2022-tests/src/lib.rs +++ b/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>, diff --git a/salsa-2022-tests/tests/compile-fail/accumulator_fields_incompatibles.rs b/tests/compile-fail/accumulator_fields_incompatibles.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/accumulator_fields_incompatibles.rs rename to tests/compile-fail/accumulator_fields_incompatibles.rs diff --git a/salsa-2022-tests/tests/compile-fail/accumulator_fields_incompatibles.stderr b/tests/compile-fail/accumulator_fields_incompatibles.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/accumulator_fields_incompatibles.stderr rename to tests/compile-fail/accumulator_fields_incompatibles.stderr diff --git a/salsa-2022-tests/tests/compile-fail/accumulator_incompatibles.rs b/tests/compile-fail/accumulator_incompatibles.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/accumulator_incompatibles.rs rename to tests/compile-fail/accumulator_incompatibles.rs diff --git a/salsa-2022-tests/tests/compile-fail/accumulator_incompatibles.stderr b/tests/compile-fail/accumulator_incompatibles.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/accumulator_incompatibles.stderr rename to tests/compile-fail/accumulator_incompatibles.stderr diff --git a/salsa-2022-tests/tests/compile-fail/get-set-on-private-field.rs b/tests/compile-fail/get-set-on-private-field.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/get-set-on-private-field.rs rename to tests/compile-fail/get-set-on-private-field.rs diff --git a/salsa-2022-tests/tests/compile-fail/get-set-on-private-field.stderr b/tests/compile-fail/get-set-on-private-field.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/get-set-on-private-field.stderr rename to tests/compile-fail/get-set-on-private-field.stderr diff --git a/salsa-2022-tests/tests/compile-fail/input_struct_id_fields_no_setters.rs b/tests/compile-fail/input_struct_id_fields_no_setters.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/input_struct_id_fields_no_setters.rs rename to tests/compile-fail/input_struct_id_fields_no_setters.rs diff --git a/salsa-2022-tests/tests/compile-fail/input_struct_id_fields_no_setters.stderr b/tests/compile-fail/input_struct_id_fields_no_setters.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/input_struct_id_fields_no_setters.stderr rename to tests/compile-fail/input_struct_id_fields_no_setters.stderr diff --git a/salsa-2022-tests/tests/compile-fail/input_struct_incompatibles.rs b/tests/compile-fail/input_struct_incompatibles.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/input_struct_incompatibles.rs rename to tests/compile-fail/input_struct_incompatibles.rs diff --git a/salsa-2022-tests/tests/compile-fail/input_struct_incompatibles.stderr b/tests/compile-fail/input_struct_incompatibles.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/input_struct_incompatibles.stderr rename to tests/compile-fail/input_struct_incompatibles.stderr diff --git a/salsa-2022-tests/tests/compile-fail/interned_struct_incompatibles.rs b/tests/compile-fail/interned_struct_incompatibles.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/interned_struct_incompatibles.rs rename to tests/compile-fail/interned_struct_incompatibles.rs diff --git a/salsa-2022-tests/tests/compile-fail/interned_struct_incompatibles.stderr b/tests/compile-fail/interned_struct_incompatibles.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/interned_struct_incompatibles.stderr rename to tests/compile-fail/interned_struct_incompatibles.stderr diff --git a/salsa-2022-tests/tests/compile-fail/jars_incompatibles.rs b/tests/compile-fail/jars_incompatibles.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/jars_incompatibles.rs rename to tests/compile-fail/jars_incompatibles.rs diff --git a/salsa-2022-tests/tests/compile-fail/jars_incompatibles.stderr b/tests/compile-fail/jars_incompatibles.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/jars_incompatibles.stderr rename to tests/compile-fail/jars_incompatibles.stderr diff --git a/salsa-2022-tests/tests/compile-fail/lru_can_not_be_used_with_specify.rs b/tests/compile-fail/lru_can_not_be_used_with_specify.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/lru_can_not_be_used_with_specify.rs rename to tests/compile-fail/lru_can_not_be_used_with_specify.rs diff --git a/salsa-2022-tests/tests/compile-fail/lru_can_not_be_used_with_specify.stderr b/tests/compile-fail/lru_can_not_be_used_with_specify.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/lru_can_not_be_used_with_specify.stderr rename to tests/compile-fail/lru_can_not_be_used_with_specify.stderr diff --git a/salsa-2022-tests/tests/compile-fail/panic-when-reading-fields-of-tracked-structs-from-older-revisions.rs b/tests/compile-fail/panic-when-reading-fields-of-tracked-structs-from-older-revisions.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/panic-when-reading-fields-of-tracked-structs-from-older-revisions.rs rename to tests/compile-fail/panic-when-reading-fields-of-tracked-structs-from-older-revisions.rs diff --git a/salsa-2022-tests/tests/compile-fail/panic-when-reading-fields-of-tracked-structs-from-older-revisions.stderr b/tests/compile-fail/panic-when-reading-fields-of-tracked-structs-from-older-revisions.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/panic-when-reading-fields-of-tracked-structs-from-older-revisions.stderr rename to tests/compile-fail/panic-when-reading-fields-of-tracked-structs-from-older-revisions.stderr diff --git a/salsa-2022-tests/tests/compile-fail/salsa_fields_incompatibles.rs b/tests/compile-fail/salsa_fields_incompatibles.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/salsa_fields_incompatibles.rs rename to tests/compile-fail/salsa_fields_incompatibles.rs diff --git a/salsa-2022-tests/tests/compile-fail/salsa_fields_incompatibles.stderr b/tests/compile-fail/salsa_fields_incompatibles.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/salsa_fields_incompatibles.stderr rename to tests/compile-fail/salsa_fields_incompatibles.stderr diff --git a/salsa-2022-tests/tests/compile-fail/singleton_only_for_input.rs b/tests/compile-fail/singleton_only_for_input.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/singleton_only_for_input.rs rename to tests/compile-fail/singleton_only_for_input.rs diff --git a/salsa-2022-tests/tests/compile-fail/singleton_only_for_input.stderr b/tests/compile-fail/singleton_only_for_input.stderr similarity index 86% rename from salsa-2022-tests/tests/compile-fail/singleton_only_for_input.stderr rename to tests/compile-fail/singleton_only_for_input.stderr index 1069544a4..5be6a283e 100644 --- a/salsa-2022-tests/tests/compile-fail/singleton_only_for_input.stderr +++ b/tests/compile-fail/singleton_only_for_input.stderr @@ -16,6 +16,12 @@ error: `singleton` option not allowed here 33 | #[salsa::accumulator(singleton)] | ^^^^^^^^^ +error[E0432]: unresolved import `salsa_2022_tests` + --> tests/compile-fail/singleton_only_for_input.rs:5:5 + | +5 | use salsa_2022_tests::{HasLogger, Logger}; + | ^^^^^^^^^^^^^^^^ use of undeclared crate or module `salsa_2022_tests` + error[E0412]: cannot find type `MyTracked` in this scope --> tests/compile-fail/singleton_only_for_input.rs:10:21 | diff --git a/salsa-2022-tests/tests/compile-fail/span-input-setter.rs b/tests/compile-fail/span-input-setter.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/span-input-setter.rs rename to tests/compile-fail/span-input-setter.rs diff --git a/salsa-2022-tests/tests/compile-fail/span-input-setter.stderr b/tests/compile-fail/span-input-setter.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/span-input-setter.stderr rename to tests/compile-fail/span-input-setter.stderr diff --git a/salsa-2022-tests/tests/compile-fail/span-tracked-getter.rs b/tests/compile-fail/span-tracked-getter.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/span-tracked-getter.rs rename to tests/compile-fail/span-tracked-getter.rs diff --git a/salsa-2022-tests/tests/compile-fail/span-tracked-getter.stderr b/tests/compile-fail/span-tracked-getter.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/span-tracked-getter.stderr rename to tests/compile-fail/span-tracked-getter.stderr diff --git a/salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.rs b/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.rs rename to tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.rs diff --git a/salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.stderr b/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.stderr similarity index 94% rename from salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.stderr rename to tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.stderr index f6eb291fc..eee7370cc 100644 --- a/salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.stderr +++ b/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.stderr @@ -6,7 +6,7 @@ error[E0277]: the trait bound `MyInput: TrackedStructInDb` is not satisf | = help: the trait `TrackedStructInDb` is implemented for `MyTracked<'db>` note: required by a bound in `function::specify::>::specify_and_record` - --> $WORKSPACE/components/salsa-2022/src/function/specify.rs + --> src/function/specify.rs | | pub fn specify_and_record<'db>(&'db self, db: &'db DynDb<'db, C>, key: Id, value: C::Value<'db>) | ------------------ required by a bound in this associated function diff --git a/salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.rs b/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.rs rename to tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.rs diff --git a/salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.stderr b/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.stderr similarity index 94% rename from salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.stderr rename to tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.stderr index 2d9009269..f91cca731 100644 --- a/salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.stderr +++ b/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.stderr @@ -6,7 +6,7 @@ error[E0277]: the trait bound `MyInterned<'_>: TrackedStructInDb` is not | = help: the trait `TrackedStructInDb` is implemented for `MyTracked<'db>` note: required by a bound in `function::specify::>::specify_and_record` - --> $WORKSPACE/components/salsa-2022/src/function/specify.rs + --> src/function/specify.rs | | pub fn specify_and_record<'db>(&'db self, db: &'db DynDb<'db, C>, key: Id, value: C::Value<'db>) | ------------------ required by a bound in this associated function diff --git a/salsa-2022-tests/tests/compile-fail/tracked_fn_incompatibles.rs b/tests/compile-fail/tracked_fn_incompatibles.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/tracked_fn_incompatibles.rs rename to tests/compile-fail/tracked_fn_incompatibles.rs diff --git a/salsa-2022-tests/tests/compile-fail/tracked_fn_incompatibles.stderr b/tests/compile-fail/tracked_fn_incompatibles.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/tracked_fn_incompatibles.stderr rename to tests/compile-fail/tracked_fn_incompatibles.stderr diff --git a/salsa-2022-tests/tests/compile-fail/tracked_impl_incompatibles.rs b/tests/compile-fail/tracked_impl_incompatibles.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/tracked_impl_incompatibles.rs rename to tests/compile-fail/tracked_impl_incompatibles.rs diff --git a/salsa-2022-tests/tests/compile-fail/tracked_impl_incompatibles.stderr b/tests/compile-fail/tracked_impl_incompatibles.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/tracked_impl_incompatibles.stderr rename to tests/compile-fail/tracked_impl_incompatibles.stderr diff --git a/salsa-2022-tests/tests/compile-fail/tracked_method_incompatibles.rs b/tests/compile-fail/tracked_method_incompatibles.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/tracked_method_incompatibles.rs rename to tests/compile-fail/tracked_method_incompatibles.rs diff --git a/salsa-2022-tests/tests/compile-fail/tracked_method_incompatibles.stderr b/tests/compile-fail/tracked_method_incompatibles.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/tracked_method_incompatibles.stderr rename to tests/compile-fail/tracked_method_incompatibles.stderr diff --git a/salsa-2022-tests/tests/compile-fail/tracked_method_on_untracked_impl.rs b/tests/compile-fail/tracked_method_on_untracked_impl.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/tracked_method_on_untracked_impl.rs rename to tests/compile-fail/tracked_method_on_untracked_impl.rs diff --git a/salsa-2022-tests/tests/compile-fail/tracked_method_on_untracked_impl.stderr b/tests/compile-fail/tracked_method_on_untracked_impl.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/tracked_method_on_untracked_impl.stderr rename to tests/compile-fail/tracked_method_on_untracked_impl.stderr diff --git a/salsa-2022-tests/tests/compile-fail/tracked_struct_incompatibles.rs b/tests/compile-fail/tracked_struct_incompatibles.rs similarity index 100% rename from salsa-2022-tests/tests/compile-fail/tracked_struct_incompatibles.rs rename to tests/compile-fail/tracked_struct_incompatibles.rs diff --git a/salsa-2022-tests/tests/compile-fail/tracked_struct_incompatibles.stderr b/tests/compile-fail/tracked_struct_incompatibles.stderr similarity index 100% rename from salsa-2022-tests/tests/compile-fail/tracked_struct_incompatibles.stderr rename to tests/compile-fail/tracked_struct_incompatibles.stderr diff --git a/salsa-2022-tests/tests/compile_fail.rs b/tests/compile_fail.rs similarity index 100% rename from salsa-2022-tests/tests/compile_fail.rs rename to tests/compile_fail.rs diff --git a/salsa-2022-tests/tests/create-empty-database.rs b/tests/create-empty-database.rs similarity index 100% rename from salsa-2022-tests/tests/create-empty-database.rs rename to tests/create-empty-database.rs diff --git a/salsa-2022-tests/tests/create-large-jar-database.rs b/tests/create-large-jar-database.rs similarity index 100% rename from salsa-2022-tests/tests/create-large-jar-database.rs rename to tests/create-large-jar-database.rs diff --git a/salsa-2022-tests/tests/cycles.rs b/tests/cycles.rs similarity index 100% rename from salsa-2022-tests/tests/cycles.rs rename to tests/cycles.rs diff --git a/salsa-2022-tests/tests/debug.rs b/tests/debug.rs similarity index 100% rename from salsa-2022-tests/tests/debug.rs rename to tests/debug.rs diff --git a/salsa-2022-tests/tests/deletion-cascade.rs b/tests/deletion-cascade.rs similarity index 98% rename from salsa-2022-tests/tests/deletion-cascade.rs rename to tests/deletion-cascade.rs index 932336205..eb6c83920 100644 --- a/salsa-2022-tests/tests/deletion-cascade.rs +++ b/tests/deletion-cascade.rs @@ -3,7 +3,8 @@ //! * when we delete memoized data, also delete outputs from that data use salsa::DebugWithDb; -use salsa_2022_tests::{HasLogger, Logger}; +mod common; +use common::{HasLogger, Logger}; use expect_test::expect; use test_log::test; diff --git a/salsa-2022-tests/tests/deletion.rs b/tests/deletion.rs similarity index 98% rename from salsa-2022-tests/tests/deletion.rs rename to tests/deletion.rs index cc0394151..fb5298729 100644 --- a/salsa-2022-tests/tests/deletion.rs +++ b/tests/deletion.rs @@ -3,7 +3,8 @@ //! * entities not created in a revision are deleted, as is any memoized data keyed on them. use salsa::DebugWithDb; -use salsa_2022_tests::{HasLogger, Logger}; +mod common; +use common::{HasLogger, Logger}; use expect_test::expect; use test_log::test; diff --git a/salsa-2022-tests/tests/elided-lifetime-in-tracked-fn.rs b/tests/elided-lifetime-in-tracked-fn.rs similarity index 97% rename from salsa-2022-tests/tests/elided-lifetime-in-tracked-fn.rs rename to tests/elided-lifetime-in-tracked-fn.rs index 3bae26671..5ce24f478 100644 --- a/salsa-2022-tests/tests/elided-lifetime-in-tracked-fn.rs +++ b/tests/elided-lifetime-in-tracked-fn.rs @@ -1,7 +1,8 @@ //! Test that a `tracked` fn on a `salsa::input` //! compiles and executes successfully. -use salsa_2022_tests::{HasLogger, Logger}; +mod common; +use common::{HasLogger, Logger}; use expect_test::expect; use test_log::test; diff --git a/salsa-2022-tests/tests/expect_reuse_field_x_of_a_tracked_struct_changes_but_fn_depends_on_field_y.rs b/tests/expect_reuse_field_x_of_a_tracked_struct_changes_but_fn_depends_on_field_y.rs similarity index 98% rename from salsa-2022-tests/tests/expect_reuse_field_x_of_a_tracked_struct_changes_but_fn_depends_on_field_y.rs rename to tests/expect_reuse_field_x_of_a_tracked_struct_changes_but_fn_depends_on_field_y.rs index d3b7c4654..dab6c0fcc 100644 --- a/salsa-2022-tests/tests/expect_reuse_field_x_of_a_tracked_struct_changes_but_fn_depends_on_field_y.rs +++ b/tests/expect_reuse_field_x_of_a_tracked_struct_changes_but_fn_depends_on_field_y.rs @@ -3,7 +3,8 @@ //! compiles and executes successfully. #![allow(dead_code)] -use salsa_2022_tests::{HasLogger, Logger}; +mod common; +use common::{HasLogger, Logger}; use expect_test::expect; diff --git a/salsa-2022-tests/tests/expect_reuse_field_x_of_an_input_changes_but_fn_depends_on_field_y.rs b/tests/expect_reuse_field_x_of_an_input_changes_but_fn_depends_on_field_y.rs similarity index 97% rename from salsa-2022-tests/tests/expect_reuse_field_x_of_an_input_changes_but_fn_depends_on_field_y.rs rename to tests/expect_reuse_field_x_of_an_input_changes_but_fn_depends_on_field_y.rs index 0096210bd..76643443c 100644 --- a/salsa-2022-tests/tests/expect_reuse_field_x_of_an_input_changes_but_fn_depends_on_field_y.rs +++ b/tests/expect_reuse_field_x_of_an_input_changes_but_fn_depends_on_field_y.rs @@ -3,7 +3,8 @@ //! compiles and executes successfully. #![allow(dead_code)] -use salsa_2022_tests::{HasLogger, Logger}; +mod common; +use common::{HasLogger, Logger}; use expect_test::expect; diff --git a/salsa-2022-tests/tests/hello_world.rs b/tests/hello_world.rs similarity index 98% rename from salsa-2022-tests/tests/hello_world.rs rename to tests/hello_world.rs index d47263064..e14d4b6bb 100644 --- a/salsa-2022-tests/tests/hello_world.rs +++ b/tests/hello_world.rs @@ -1,7 +1,8 @@ //! Test that a `tracked` fn on a `salsa::input` //! compiles and executes successfully. -use salsa_2022_tests::{HasLogger, Logger}; +mod common; +use common::{HasLogger, Logger}; use expect_test::expect; use test_log::test; diff --git a/salsa-2022-tests/tests/input_with_ids.rs b/tests/input_with_ids.rs similarity index 100% rename from salsa-2022-tests/tests/input_with_ids.rs rename to tests/input_with_ids.rs diff --git a/salsa-2022-tests/tests/interned-struct-with-lifetime.rs b/tests/interned-struct-with-lifetime.rs similarity index 96% rename from salsa-2022-tests/tests/interned-struct-with-lifetime.rs rename to tests/interned-struct-with-lifetime.rs index e44f498e4..2e7bee80c 100644 --- a/salsa-2022-tests/tests/interned-struct-with-lifetime.rs +++ b/tests/interned-struct-with-lifetime.rs @@ -1,7 +1,8 @@ //! Test that a `tracked` fn on a `salsa::input` //! compiles and executes successfully. use salsa::DebugWithDb; -use salsa_2022_tests::{HasLogger, Logger}; +mod common; +use common::{HasLogger, Logger}; use expect_test::expect; use test_log::test; diff --git a/salsa-2022-tests/tests/is_send_sync.rs b/tests/is_send_sync.rs similarity index 100% rename from salsa-2022-tests/tests/is_send_sync.rs rename to tests/is_send_sync.rs diff --git a/salsa-2022-tests/tests/lru.rs b/tests/lru.rs similarity index 99% rename from salsa-2022-tests/tests/lru.rs rename to tests/lru.rs index 2b84f3cc3..51fb625e8 100644 --- a/salsa-2022-tests/tests/lru.rs +++ b/tests/lru.rs @@ -7,7 +7,8 @@ use std::sync::{ }; use salsa::Database; -use salsa_2022_tests::{HasLogger, Logger}; +mod common; +use common::{HasLogger, Logger}; use test_log::test; #[salsa::jar(db = Db)] diff --git a/salsa-2022-tests/tests/mutate_in_place.rs b/tests/mutate_in_place.rs similarity index 96% rename from salsa-2022-tests/tests/mutate_in_place.rs rename to tests/mutate_in_place.rs index e48795499..32327620d 100644 --- a/salsa-2022-tests/tests/mutate_in_place.rs +++ b/tests/mutate_in_place.rs @@ -1,7 +1,8 @@ //! Test that a setting a field on a `#[salsa::input]` //! overwrites and returns the old value. -use salsa_2022_tests::{HasLogger, Logger}; +mod common; +use common::{HasLogger, Logger}; use test_log::test; diff --git a/salsa-2022-tests/tests/override_new_get_set.rs b/tests/override_new_get_set.rs similarity index 100% rename from salsa-2022-tests/tests/override_new_get_set.rs rename to tests/override_new_get_set.rs diff --git a/salsa-2022-tests/tests/panic-when-creating-tracked-struct-outside-of-tracked-fn.rs b/tests/panic-when-creating-tracked-struct-outside-of-tracked-fn.rs similarity index 100% rename from salsa-2022-tests/tests/panic-when-creating-tracked-struct-outside-of-tracked-fn.rs rename to tests/panic-when-creating-tracked-struct-outside-of-tracked-fn.rs diff --git a/salsa-2022-tests/tests/parallel/main.rs b/tests/parallel/main.rs similarity index 100% rename from salsa-2022-tests/tests/parallel/main.rs rename to tests/parallel/main.rs diff --git a/salsa-2022-tests/tests/parallel/parallel_cycle_all_recover.rs b/tests/parallel/parallel_cycle_all_recover.rs similarity index 100% rename from salsa-2022-tests/tests/parallel/parallel_cycle_all_recover.rs rename to tests/parallel/parallel_cycle_all_recover.rs diff --git a/salsa-2022-tests/tests/parallel/parallel_cycle_mid_recover.rs b/tests/parallel/parallel_cycle_mid_recover.rs similarity index 100% rename from salsa-2022-tests/tests/parallel/parallel_cycle_mid_recover.rs rename to tests/parallel/parallel_cycle_mid_recover.rs diff --git a/salsa-2022-tests/tests/parallel/parallel_cycle_none_recover.rs b/tests/parallel/parallel_cycle_none_recover.rs similarity index 100% rename from salsa-2022-tests/tests/parallel/parallel_cycle_none_recover.rs rename to tests/parallel/parallel_cycle_none_recover.rs diff --git a/salsa-2022-tests/tests/parallel/parallel_cycle_one_recover.rs b/tests/parallel/parallel_cycle_one_recover.rs similarity index 100% rename from salsa-2022-tests/tests/parallel/parallel_cycle_one_recover.rs rename to tests/parallel/parallel_cycle_one_recover.rs diff --git a/salsa-2022-tests/tests/parallel/setup.rs b/tests/parallel/setup.rs similarity index 100% rename from salsa-2022-tests/tests/parallel/setup.rs rename to tests/parallel/setup.rs diff --git a/salsa-2022-tests/tests/parallel/signal.rs b/tests/parallel/signal.rs similarity index 100% rename from salsa-2022-tests/tests/parallel/signal.rs rename to tests/parallel/signal.rs diff --git a/salsa-2022-tests/tests/preverify-struct-with-leaked-data.rs b/tests/preverify-struct-with-leaked-data.rs similarity index 98% rename from salsa-2022-tests/tests/preverify-struct-with-leaked-data.rs rename to tests/preverify-struct-with-leaked-data.rs index 7d542a65f..38104f19a 100644 --- a/salsa-2022-tests/tests/preverify-struct-with-leaked-data.rs +++ b/tests/preverify-struct-with-leaked-data.rs @@ -5,7 +5,8 @@ use std::cell::Cell; use expect_test::expect; use salsa::DebugWithDb; -use salsa_2022_tests::{HasLogger, Logger}; +mod common; +use common::{HasLogger, Logger}; use test_log::test; thread_local! { diff --git a/salsa-2022-tests/tests/singleton.rs b/tests/singleton.rs similarity index 96% rename from salsa-2022-tests/tests/singleton.rs rename to tests/singleton.rs index d72b19ed3..adf339ed9 100644 --- a/salsa-2022-tests/tests/singleton.rs +++ b/tests/singleton.rs @@ -4,7 +4,8 @@ use expect_test::expect; use salsa::DebugWithDb; -use salsa_2022_tests::{HasLogger, Logger}; +mod common; +use common::{HasLogger, Logger}; use test_log::test; diff --git a/salsa-2022-tests/tests/specify-only-works-if-the-key-is-created-in-the-current-query.rs b/tests/specify-only-works-if-the-key-is-created-in-the-current-query.rs similarity index 100% rename from salsa-2022-tests/tests/specify-only-works-if-the-key-is-created-in-the-current-query.rs rename to tests/specify-only-works-if-the-key-is-created-in-the-current-query.rs diff --git a/salsa-2022-tests/tests/specify_tracked_fn_in_rev_1_but_not_2.rs b/tests/specify_tracked_fn_in_rev_1_but_not_2.rs similarity index 99% rename from salsa-2022-tests/tests/specify_tracked_fn_in_rev_1_but_not_2.rs rename to tests/specify_tracked_fn_in_rev_1_but_not_2.rs index 998815692..a96e65057 100644 --- a/salsa-2022-tests/tests/specify_tracked_fn_in_rev_1_but_not_2.rs +++ b/tests/specify_tracked_fn_in_rev_1_but_not_2.rs @@ -3,7 +3,8 @@ use expect_test::expect; use salsa::DebugWithDb; -use salsa_2022_tests::{HasLogger, Logger}; +mod common; +use common::{HasLogger, Logger}; use test_log::test; #[salsa::jar(db = Db)] diff --git a/salsa-2022-tests/tests/tracked-struct-id-field-bad-eq.rs b/tests/tracked-struct-id-field-bad-eq.rs similarity index 100% rename from salsa-2022-tests/tests/tracked-struct-id-field-bad-eq.rs rename to tests/tracked-struct-id-field-bad-eq.rs diff --git a/salsa-2022-tests/tests/tracked-struct-id-field-bad-hash.rs b/tests/tracked-struct-id-field-bad-hash.rs similarity index 100% rename from salsa-2022-tests/tests/tracked-struct-id-field-bad-hash.rs rename to tests/tracked-struct-id-field-bad-hash.rs diff --git a/salsa-2022-tests/tests/tracked-struct-unchanged-in-new-rev.rs b/tests/tracked-struct-unchanged-in-new-rev.rs similarity index 100% rename from salsa-2022-tests/tests/tracked-struct-unchanged-in-new-rev.rs rename to tests/tracked-struct-unchanged-in-new-rev.rs diff --git a/salsa-2022-tests/tests/tracked-struct-value-field-bad-eq.rs b/tests/tracked-struct-value-field-bad-eq.rs similarity index 98% rename from salsa-2022-tests/tests/tracked-struct-value-field-bad-eq.rs rename to tests/tracked-struct-value-field-bad-eq.rs index e6665d254..cecfcbbdc 100644 --- a/salsa-2022-tests/tests/tracked-struct-value-field-bad-eq.rs +++ b/tests/tracked-struct-value-field-bad-eq.rs @@ -4,7 +4,8 @@ use expect_test::expect; use salsa::DebugWithDb; -use salsa_2022_tests::{HasLogger, Logger}; +mod common; +use common::{HasLogger, Logger}; use test_log::test; #[salsa::jar(db = Db)] diff --git a/salsa-2022-tests/tests/tracked-struct-value-field-not-eq.rs b/tests/tracked-struct-value-field-not-eq.rs similarity index 100% rename from salsa-2022-tests/tests/tracked-struct-value-field-not-eq.rs rename to tests/tracked-struct-value-field-not-eq.rs diff --git a/salsa-2022-tests/tests/tracked_fn_constant.rs b/tests/tracked_fn_constant.rs similarity index 100% rename from salsa-2022-tests/tests/tracked_fn_constant.rs rename to tests/tracked_fn_constant.rs diff --git a/salsa-2022-tests/tests/tracked_fn_on_input.rs b/tests/tracked_fn_on_input.rs similarity index 100% rename from salsa-2022-tests/tests/tracked_fn_on_input.rs rename to tests/tracked_fn_on_input.rs diff --git a/salsa-2022-tests/tests/tracked_fn_on_tracked.rs b/tests/tracked_fn_on_tracked.rs similarity index 100% rename from salsa-2022-tests/tests/tracked_fn_on_tracked.rs rename to tests/tracked_fn_on_tracked.rs diff --git a/salsa-2022-tests/tests/tracked_fn_on_tracked_specify.rs b/tests/tracked_fn_on_tracked_specify.rs similarity index 100% rename from salsa-2022-tests/tests/tracked_fn_on_tracked_specify.rs rename to tests/tracked_fn_on_tracked_specify.rs diff --git a/salsa-2022-tests/tests/tracked_fn_read_own_entity.rs b/tests/tracked_fn_read_own_entity.rs similarity index 98% rename from salsa-2022-tests/tests/tracked_fn_read_own_entity.rs rename to tests/tracked_fn_read_own_entity.rs index 0821c839c..0aa354dcc 100644 --- a/salsa-2022-tests/tests/tracked_fn_read_own_entity.rs +++ b/tests/tracked_fn_read_own_entity.rs @@ -2,7 +2,8 @@ //! compiles and executes successfully. use expect_test::expect; -use salsa_2022_tests::{HasLogger, Logger}; +mod common; +use common::{HasLogger, Logger}; use test_log::test; #[salsa::jar(db = Db)] diff --git a/salsa-2022-tests/tests/tracked_fn_read_own_specify.rs b/tests/tracked_fn_read_own_specify.rs similarity index 97% rename from salsa-2022-tests/tests/tracked_fn_read_own_specify.rs rename to tests/tracked_fn_read_own_specify.rs index 8633572e5..5785464af 100644 --- a/salsa-2022-tests/tests/tracked_fn_read_own_specify.rs +++ b/tests/tracked_fn_read_own_specify.rs @@ -1,6 +1,7 @@ use expect_test::expect; use salsa::{Database as SalsaDatabase, DebugWithDb}; -use salsa_2022_tests::{HasLogger, Logger}; +mod common; +use common::{HasLogger, Logger}; #[salsa::jar(db = Db)] struct Jar(MyInput, MyTracked<'_>, tracked_fn, tracked_fn_extra); diff --git a/salsa-2022-tests/tests/tracked_method.rs b/tests/tracked_method.rs similarity index 100% rename from salsa-2022-tests/tests/tracked_method.rs rename to tests/tracked_method.rs diff --git a/salsa-2022-tests/tests/tracked_struct_db1_lt.rs b/tests/tracked_struct_db1_lt.rs similarity index 94% rename from salsa-2022-tests/tests/tracked_struct_db1_lt.rs rename to tests/tracked_struct_db1_lt.rs index d71d0cd2a..b5214f1bb 100644 --- a/salsa-2022-tests/tests/tracked_struct_db1_lt.rs +++ b/tests/tracked_struct_db1_lt.rs @@ -1,7 +1,8 @@ //! Test that tracked structs with lifetimes not named `'db` //! compile successfully. -use salsa_2022_tests::{HasLogger, Logger}; +mod common; +use common::{HasLogger, Logger}; use test_log::test; diff --git a/salsa-2022-tests/tests/tracked_with_intern.rs b/tests/tracked_with_intern.rs similarity index 100% rename from salsa-2022-tests/tests/tracked_with_intern.rs rename to tests/tracked_with_intern.rs diff --git a/salsa-2022-tests/tests/tracked_with_struct_db.rs b/tests/tracked_with_struct_db.rs similarity index 100% rename from salsa-2022-tests/tests/tracked_with_struct_db.rs rename to tests/tracked_with_struct_db.rs diff --git a/salsa-2022-tests/tests/warnings/main.rs b/tests/warnings/main.rs similarity index 100% rename from salsa-2022-tests/tests/warnings/main.rs rename to tests/warnings/main.rs diff --git a/salsa-2022-tests/tests/warnings/needless_borrow.rs b/tests/warnings/needless_borrow.rs similarity index 100% rename from salsa-2022-tests/tests/warnings/needless_borrow.rs rename to tests/warnings/needless_borrow.rs diff --git a/salsa-2022-tests/tests/warnings/needless_lifetimes.rs b/tests/warnings/needless_lifetimes.rs similarity index 100% rename from salsa-2022-tests/tests/warnings/needless_lifetimes.rs rename to tests/warnings/needless_lifetimes.rs diff --git a/salsa-2022-tests/tests/warnings/unused_variable_db.rs b/tests/warnings/unused_variable_db.rs similarity index 100% rename from salsa-2022-tests/tests/warnings/unused_variable_db.rs rename to tests/warnings/unused_variable_db.rs