Fix error in feature gates

mondeja · Mar 10, 2024 · d43a24f · d43a24f
1 parent 2e95103
commit d43a24f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 12 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -28,6 +28,9 @@ repos:
     rev: v1.0
     hooks:
       - id: fmt
+      - id: cargo-check
+        name: cargo-check-no-features
+        alias: cargo-check-no-features
       - id: cargo-check
         name: cargo-check-csr
         alias: cargo-check-csr
@@ -40,6 +43,10 @@ repos:
         name: cargo-check-hydrate
         alias: cargo-check-hydrate
         args: [--features=hydrate]
+      - id: clippy
+        alias: clippy-no-features
+        name: clippy-no-features
+        args: [--, -A, clippy::comparison-chain, -Dwarnings]
       - id: clippy
         alias: clippy-csr
         name: clippy-csr

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/leptos-fluent/Cargo.toml b/leptos-fluent/Cargo.toml
@@ -8,7 +8,7 @@ documentation = "https://docs.rs/leptos-fluent"
 repository = "https://github.com/mondeja/leptos-fluent"
 
 [dependencies]
-leptos-fluent-macros = { path = "../leptos-fluent-macros" }
+leptos-fluent-macros = "0.0.19"
 fluent-templates = "0.9"
 leptos = ">=0.1"
 leptos_router = { version = ">=0.1", optional = true }

diff --git a/leptos-fluent/src/localstorage.rs b/leptos-fluent/src/localstorage.rs
@@ -1,9 +1,7 @@
 use cfg_if::cfg_if;
 
-pub fn get(
-    #[cfg_attr(feature = "ssr", allow(unused_variables))] key: &str,
-) -> Option<String> {
-    cfg_if! { if #[cfg(not(feature = "ssr"))] {
+pub fn get(#[allow(unused_variables)] key: &str) -> Option<String> {
+    cfg_if! { if #[cfg(all(not(feature = "ssr"), feature = "csr", feature = "hydrate"))] {
         ::leptos::window()
             .local_storage()
             .unwrap()
@@ -16,8 +14,8 @@ pub fn get(
 }
 
 pub fn set(
-    #[cfg_attr(feature = "ssr", allow(unused_variables))] key: &str,
-    #[cfg_attr(feature = "ssr", allow(unused_variables))] value: &str,
+    #[allow(unused_variables)] key: &str,
+    #[allow(unused_variables)] value: &str,
 ) {
     cfg_if! { if #[cfg(any(feature = "csr", feature = "hydrate"))] {
         ::leptos::window()

diff --git a/leptos-fluent/src/url.rs b/leptos-fluent/src/url.rs
@@ -1,9 +1,7 @@
 use cfg_if::cfg_if;
 
-pub fn get(
-    #[cfg_attr(feature = "ssr", allow(unused_variables))] k: &str,
-) -> Option<String> {
-    cfg_if! { if #[cfg(not(feature = "ssr"))] {
+pub fn get(#[allow(unused_variables)] k: &str) -> Option<String> {
+    cfg_if! { if #[cfg(all(not(feature = "ssr"), feature = "csr", feature = "hydrate"))] {
         use leptos_router::Url;
 
         let query = ::leptos::window().location().search().unwrap();