From a0d75fda03aa321d0f5e4575ce3a73afb401ee8b Mon Sep 17 00:00:00 2001
From: Saber Haj Rabiee <sabify@users.noreply.github.com>
Date: Fri, 21 Mar 2025 10:16:16 -0700
Subject: [PATCH] chore: no need to filter out "nightly" feature as of #3735
 (#3747)

* chore: no need to filter out "nightly" feature as of #3735

* fix: enable hot-reload only if in all debug mode, nightly feature and
nightly rustc

* fix: do not build/test against nightly feature alone

* fix: don not test against nightly feature alone

* fix: add trace-components to denylist
---
 leptos/Cargo.toml                            | 53 +++++---------------
 leptos/src/into_view.rs                      | 12 ++---
 leptos_macro/Cargo.toml                      |  5 +-
 server_fn/server_fn_macro_default/Cargo.toml |  1 +
 server_fn_macro/Cargo.toml                   |  1 +
 tachys/Cargo.toml                            |  3 ++
 6 files changed, 27 insertions(+), 48 deletions(-)

diff --git a/leptos/Cargo.toml b/leptos/Cargo.toml
index 520c159ec..662dbde37 100644
--- a/leptos/Cargo.toml
+++ b/leptos/Cargo.toml
@@ -110,7 +110,6 @@ leptos_macro = { workspace = true, features = ["__internal_erase_components"] }
 
 [package.metadata.cargo-all-features]
 denylist = [
-  "nightly",
   "tracing",
   "template_macro",
   "rustls",
@@ -122,46 +121,18 @@ denylist = [
   "islands",
 ]
 skip_feature_sets = [
-  [
-    "csr",
-    "ssr",
-  ],
-  [
-    "csr",
-    "hydrate",
-  ],
-  [
-    "ssr",
-    "hydrate",
-  ],
-  [
-    "serde",
-    "serde-lite",
-  ],
-  [
-    "serde-lite",
-    "miniserde",
-  ],
-  [
-    "serde",
-    "miniserde",
-  ],
-  [
-    "serde",
-    "rkyv",
-  ],
-  [
-    "miniserde",
-    "rkyv",
-  ],
-  [
-    "serde-lite",
-    "rkyv",
-  ],
-  [
-    "default-tls",
-    "rustls",
-  ],
+  ["csr", "ssr"],
+  ["csr", "hydrate"],
+  ["ssr", "hydrate"],
+  ["serde", "serde-lite"],
+  ["serde-lite", "miniserde"],
+  ["serde", "miniserde"],
+  ["serde", "rkyv"],
+  ["miniserde", "rkyv"],
+  ["serde-lite", "rkyv"],
+  ["default-tls", "rustls"],
+  # do not test against nightly feature alone
+  ["nightly"],
 ]
 max_combination_size = 2
 
diff --git a/leptos/src/into_view.rs b/leptos/src/into_view.rs
index 9ffaa512f..7ae54aeae 100644
--- a/leptos/src/into_view.rs
+++ b/leptos/src/into_view.rs
@@ -107,9 +107,9 @@ impl<T: RenderHtml> RenderHtml for View<T> {
         mark_branches: bool,
         extra_attrs: Vec<AnyAttribute>,
     ) {
-        #[cfg(debug_assertions)]
+        #[cfg(all(debug_assertions, feature = "nightly", rustc_nightly))]
         let vm = self.view_marker.to_owned();
-        #[cfg(debug_assertions)]
+        #[cfg(all(debug_assertions, feature = "nightly", rustc_nightly))]
         if let Some(vm) = vm.as_ref() {
             buf.push_str(&format!("<!--hot-reload|{vm}|open-->"));
         }
@@ -122,7 +122,7 @@ impl<T: RenderHtml> RenderHtml for View<T> {
             extra_attrs,
         );
 
-        #[cfg(debug_assertions)]
+        #[cfg(all(debug_assertions, feature = "nightly", rustc_nightly))]
         if let Some(vm) = vm.as_ref() {
             buf.push_str(&format!("<!--hot-reload|{vm}|close-->"));
         }
@@ -138,9 +138,9 @@ impl<T: RenderHtml> RenderHtml for View<T> {
     ) where
         Self: Sized,
     {
-        #[cfg(debug_assertions)]
+        #[cfg(all(debug_assertions, feature = "nightly", rustc_nightly))]
         let vm = self.view_marker.to_owned();
-        #[cfg(debug_assertions)]
+        #[cfg(all(debug_assertions, feature = "nightly", rustc_nightly))]
         if let Some(vm) = vm.as_ref() {
             buf.push_sync(&format!("<!--hot-reload|{vm}|open-->"));
         }
@@ -153,7 +153,7 @@ impl<T: RenderHtml> RenderHtml for View<T> {
             extra_attrs,
         );
 
-        #[cfg(debug_assertions)]
+        #[cfg(all(debug_assertions, feature = "nightly", rustc_nightly))]
         if let Some(vm) = vm.as_ref() {
             buf.push_sync(&format!("<!--hot-reload|{vm}|close-->"));
         }
diff --git a/leptos_macro/Cargo.toml b/leptos_macro/Cargo.toml
index 748a06295..9348ea919 100644
--- a/leptos_macro/Cargo.toml
+++ b/leptos_macro/Cargo.toml
@@ -63,7 +63,7 @@ generic = ["server_fn_macro/generic"]
 __internal_erase_components = []
 
 [package.metadata.cargo-all-features]
-denylist = ["nightly", "tracing", "trace-component-props"]
+denylist = ["tracing", "trace-component-props", "trace-components"]
 skip_feature_sets = [
   [
     "csr",
@@ -89,6 +89,9 @@ skip_feature_sets = [
     "generic",
     "axum",
   ],
+  [
+    "nightly",
+  ],
 ]
 max_combination_size = 2
 
diff --git a/server_fn/server_fn_macro_default/Cargo.toml b/server_fn/server_fn_macro_default/Cargo.toml
index 31fffe7b4..365043700 100644
--- a/server_fn/server_fn_macro_default/Cargo.toml
+++ b/server_fn/server_fn_macro_default/Cargo.toml
@@ -22,3 +22,4 @@ axum = ["server_fn_macro/axum"]
 
 [package.metadata.cargo-all-features]
 max_combination_size = 2
+skip_feature_sets = [["nightly"]]
diff --git a/server_fn_macro/Cargo.toml b/server_fn_macro/Cargo.toml
index 70f3766d1..7502b2675 100644
--- a/server_fn_macro/Cargo.toml
+++ b/server_fn_macro/Cargo.toml
@@ -34,6 +34,7 @@ rustdoc-args = ["--generate-link-to-definition"]
 
 [package.metadata.cargo-all-features]
 max_combination_size = 2
+skip_feature_sets = [["nightly"]]
 
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(rustc_nightly)'] }
diff --git a/tachys/Cargo.toml b/tachys/Cargo.toml
index d0477b492..6d5cfe49a 100644
--- a/tachys/Cargo.toml
+++ b/tachys/Cargo.toml
@@ -202,6 +202,9 @@ skip_feature_sets = [
     "ssr",
     "delegation",
   ],
+  [
+    "nightly",
+  ],
 ]
 max_combination_size = 2