From 38070130a8d84faee0758dc590da2e38f7b7559f Mon Sep 17 00:00:00 2001 From: Matthijs Brobbel Date: Wed, 19 Jun 2024 11:55:18 +0200 Subject: [PATCH 1/2] Remove some unused dependencies --- Cargo.toml | 2 -- components/salsa-macros/Cargo.toml | 2 -- src/function/lru.rs | 2 +- src/function/memo.rs | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f1a2d7a8f..8b4a93f1a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,6 @@ description = "A generic framework for on-demand, incrementalized computation (e [dependencies] arc-swap = "1.6.0" crossbeam = "0.8.1" -crossbeam-utils = { version = "0.8", default-features = false } dashmap = "5.3.4" hashlink = "0.8.0" indexmap = "2" @@ -27,7 +26,6 @@ expect-test = "1.4.0" eyre = "0.6.8" notify-debouncer-mini = "0.2.1" ordered-float = "3.0" -parking_lot = "0.12.1" rustversion = "1.0" test-log = "0.2.11" trybuild = "1.0" diff --git a/components/salsa-macros/Cargo.toml b/components/salsa-macros/Cargo.toml index 97b8578ca..1bceeeae9 100644 --- a/components/salsa-macros/Cargo.toml +++ b/components/salsa-macros/Cargo.toml @@ -11,8 +11,6 @@ description = "Procedural macros for the salsa crate" proc-macro = true [dependencies] -eyre = "0.6.5" -heck = "0.4" proc-macro2 = "1.0" quote = "1.0" syn = { version = "2.0.64", features = ["full", "visit-mut"] } diff --git a/src/function/lru.rs b/src/function/lru.rs index fdc800733..f1ee5fc0a 100644 --- a/src/function/lru.rs +++ b/src/function/lru.rs @@ -1,6 +1,6 @@ use crate::{hash::FxLinkedHashSet, Id}; -use crossbeam_utils::atomic::AtomicCell; +use crossbeam::atomic::AtomicCell; use parking_lot::Mutex; #[derive(Default)] diff --git a/src/function/memo.rs b/src/function/memo.rs index a40c21e5a..072cfdb0f 100644 --- a/src/function/memo.rs +++ b/src/function/memo.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use arc_swap::{ArcSwap, Guard}; -use crossbeam_utils::atomic::AtomicCell; +use crossbeam::atomic::AtomicCell; use crate::{ hash::FxDashMap, key::DatabaseKeyIndex, runtime::local_state::QueryRevisions, Event, EventKind, From 396c4a40731a6bc74c85dbf19d125d92a121f516 Mon Sep 17 00:00:00 2001 From: Matthijs Brobbel Date: Thu, 20 Jun 2024 17:03:02 +0200 Subject: [PATCH 2/2] Also remove `env_logger` --- Cargo.toml | 1 - tests/compile-fail/singleton_only_for_input.stderr | 3 --- 2 files changed, 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8b4a93f1a..767fbbbbe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,6 @@ smallvec = "1.0.0" [dev-dependencies] derive-new = "0.5.9" -env_logger = "*" expect-test = "1.4.0" eyre = "0.6.8" notify-debouncer-mini = "0.2.1" diff --git a/tests/compile-fail/singleton_only_for_input.stderr b/tests/compile-fail/singleton_only_for_input.stderr index dbfade51b..ce5fcda5e 100644 --- a/tests/compile-fail/singleton_only_for_input.stderr +++ b/tests/compile-fail/singleton_only_for_input.stderr @@ -32,9 +32,6 @@ error[E0432]: unresolved imports `common::HasLogger`, `common::Logger` | ^^^^^^^^^ ^^^^^^ no `Logger` in `common` | | | no `HasLogger` in `common` - | - = help: consider importing this struct instead: - env_logger::Logger error[E0412]: cannot find type `MyTracked` in this scope --> tests/compile-fail/singleton_only_for_input.rs:11:21