From 278448f12d8e1eda6aab236f971a073453db5240 Mon Sep 17 00:00:00 2001 From: SleeplessOne1917 Date: Fri, 9 Feb 2024 18:05:09 -0500 Subject: [PATCH] Make it so api_common doesn't pull in unnecessary deps --- Cargo.toml | 2 +- crates/api/Cargo.toml | 2 +- crates/api_common/Cargo.toml | 3 ++- crates/api_crud/Cargo.toml | 2 +- crates/apub/Cargo.toml | 2 +- crates/db_perf/Cargo.toml | 2 +- crates/db_schema/Cargo.toml | 2 +- crates/db_views/Cargo.toml | 2 +- crates/routes/Cargo.toml | 2 +- crates/utils/src/rate_limit/mod.rs | 3 ++- 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 76694e607..98bf79b8c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,7 +89,7 @@ unwrap_used = "deny" lemmy_api = { version = "=0.19.3", path = "./crates/api" } lemmy_api_crud = { version = "=0.19.3", path = "./crates/api_crud" } lemmy_apub = { version = "=0.19.3", path = "./crates/apub" } -lemmy_utils = { version = "=0.19.3", path = "./crates/utils" } +lemmy_utils = { version = "=0.19.3", path = "./crates/utils", default-features = false } lemmy_db_schema = { version = "=0.19.3", path = "./crates/db_schema" } lemmy_api_common = { version = "=0.19.3", path = "./crates/api_common" } lemmy_routes = { version = "=0.19.3", path = "./crates/routes" } diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml index 66dcea19b..21b07420a 100644 --- a/crates/api/Cargo.toml +++ b/crates/api/Cargo.toml @@ -18,7 +18,7 @@ doctest = false workspace = true [dependencies] -lemmy_utils = { workspace = true } +lemmy_utils = { workspace = true, features = ["default"] } lemmy_db_schema = { workspace = true, features = ["full"] } lemmy_db_views = { workspace = true, features = ["full"] } lemmy_db_views_moderator = { workspace = true, features = ["full"] } diff --git a/crates/api_common/Cargo.toml b/crates/api_common/Cargo.toml index e8b8fbc76..9d144ddb4 100644 --- a/crates/api_common/Cargo.toml +++ b/crates/api_common/Cargo.toml @@ -23,6 +23,7 @@ full = [ "lemmy_db_views/full", "lemmy_db_views_actor/full", "lemmy_db_views_moderator/full", + "lemmy_utils/default", "activitypub_federation", "encoding", "reqwest-middleware", @@ -43,7 +44,7 @@ lemmy_db_views = { workspace = true } lemmy_db_views_moderator = { workspace = true } lemmy_db_views_actor = { workspace = true } lemmy_db_schema = { workspace = true } -lemmy_utils = { workspace = true } +lemmy_utils = { workspace = true, features = ["error-type"] } activitypub_federation = { workspace = true, optional = true } serde = { workspace = true } serde_with = { workspace = true } diff --git a/crates/api_crud/Cargo.toml b/crates/api_crud/Cargo.toml index d72ed27c9..2211d84ad 100644 --- a/crates/api_crud/Cargo.toml +++ b/crates/api_crud/Cargo.toml @@ -13,7 +13,7 @@ repository.workspace = true workspace = true [dependencies] -lemmy_utils = { workspace = true } +lemmy_utils = { workspace = true, features = ["default"] } lemmy_db_schema = { workspace = true, features = ["full"] } lemmy_db_views = { workspace = true, features = ["full"] } lemmy_db_views_actor = { workspace = true, features = ["full"] } diff --git a/crates/apub/Cargo.toml b/crates/apub/Cargo.toml index 175efbd45..33778a1b0 100644 --- a/crates/apub/Cargo.toml +++ b/crates/apub/Cargo.toml @@ -18,7 +18,7 @@ doctest = false workspace = true [dependencies] -lemmy_utils = { workspace = true } +lemmy_utils = { workspace = true, features = ["default"] } lemmy_db_schema = { workspace = true, features = ["full"] } lemmy_db_views = { workspace = true, features = ["full"] } lemmy_db_views_actor = { workspace = true, features = ["full"] } diff --git a/crates/db_perf/Cargo.toml b/crates/db_perf/Cargo.toml index 87d2a58ac..2787eb8ca 100644 --- a/crates/db_perf/Cargo.toml +++ b/crates/db_perf/Cargo.toml @@ -19,5 +19,5 @@ diesel = { workspace = true } diesel-async = { workspace = true } lemmy_db_schema = { workspace = true } lemmy_db_views = { workspace = true, features = ["full"] } -lemmy_utils = { workspace = true } +lemmy_utils = { workspace = true, features = ["default"] } tokio = { workspace = true } diff --git a/crates/db_schema/Cargo.toml b/crates/db_schema/Cargo.toml index 91ff39bfe..6d227ad40 100644 --- a/crates/db_schema/Cargo.toml +++ b/crates/db_schema/Cargo.toml @@ -48,7 +48,7 @@ strum = { workspace = true } strum_macros = { workspace = true } serde_json = { workspace = true, optional = true } activitypub_federation = { workspace = true, optional = true } -lemmy_utils = { workspace = true, optional = true } +lemmy_utils = { workspace = true, optional = true, features = ["default"] } bcrypt = { workspace = true, optional = true } diesel = { workspace = true, features = [ "postgres", diff --git a/crates/db_views/Cargo.toml b/crates/db_views/Cargo.toml index 3f0ba5aff..4144a99d8 100644 --- a/crates/db_views/Cargo.toml +++ b/crates/db_views/Cargo.toml @@ -29,7 +29,7 @@ full = [ [dependencies] lemmy_db_schema = { workspace = true } -lemmy_utils = { workspace = true, optional = true } +lemmy_utils = { workspace = true, optional = true, features = ["default"] } diesel = { workspace = true, optional = true } diesel-async = { workspace = true, optional = true } diesel_ltree = { workspace = true, optional = true } diff --git a/crates/routes/Cargo.toml b/crates/routes/Cargo.toml index d70014678..324894ab9 100644 --- a/crates/routes/Cargo.toml +++ b/crates/routes/Cargo.toml @@ -16,7 +16,7 @@ doctest = false workspace = true [dependencies] -lemmy_utils = { workspace = true } +lemmy_utils = { workspace = true, features = ["default"] } lemmy_db_views = { workspace = true } lemmy_db_views_actor = { workspace = true } lemmy_db_schema = { workspace = true } diff --git a/crates/utils/src/rate_limit/mod.rs b/crates/utils/src/rate_limit/mod.rs index 2b5e951bb..b2efbe2c9 100644 --- a/crates/utils/src/rate_limit/mod.rs +++ b/crates/utils/src/rate_limit/mod.rs @@ -2,7 +2,8 @@ use crate::error::{LemmyError, LemmyErrorType}; use actix_web::dev::{ConnectionInfo, Service, ServiceRequest, ServiceResponse, Transform}; use enum_map::{enum_map, EnumMap}; use futures::future::{ok, Ready}; -use rate_limiter::{ActionType, BucketConfig, InstantSecs, RateLimitState}; +pub use rate_limiter::{ActionType, BucketConfig}; +use rate_limiter::{InstantSecs, RateLimitState}; use std::{ future::Future, net::{IpAddr, Ipv4Addr, SocketAddr},