From 33d4721fbe06908b6cd7e41ede63333e697bb37c Mon Sep 17 00:00:00 2001
From: Leonard
Date: Tue, 24 Oct 2023 00:10:56 +0200
Subject: [PATCH 1/3] Fix
---
.../component_body_deserializers/inline_props.rs | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/packages/core-macro/src/component_body_deserializers/inline_props.rs b/packages/core-macro/src/component_body_deserializers/inline_props.rs
index 670a14d88..d51132623 100644
--- a/packages/core-macro/src/component_body_deserializers/inline_props.rs
+++ b/packages/core-macro/src/component_body_deserializers/inline_props.rs
@@ -186,13 +186,13 @@ fn get_props_docs(fn_ident: &Ident, inputs: Vec<&FnArg>) -> Vec {
let arg_name = arg_name.into_token_stream().to_string();
let arg_type = crate::utils::format_type_string(arg_type);
- let input_arg_doc =
- keep_up_to_n_consecutive_chars(input_arg_doc.trim(), 2, '\n').replace('\n', "
");
+ let input_arg_doc = keep_up_to_n_consecutive_chars(input_arg_doc.trim(), 2, '\n')
+ .replace("\n\n", "
");
let prop_def_link = format!("{props_def_link}::{arg_name}");
let mut arg_doc = format!("- [`{arg_name}`]({prop_def_link}) : `{arg_type}`");
if let Some(deprecation) = deprecation {
- arg_doc.push_str("
👎 Deprecated");
+ arg_doc.push_str("
👎 Deprecated");
if let Some(since) = deprecation.since {
arg_doc.push_str(&format!(" since {since}"));
@@ -205,14 +205,16 @@ fn get_props_docs(fn_ident: &Ident, inputs: Vec<&FnArg>) -> Vec {
arg_doc.push_str(&format!(": {note}"));
}
+ arg_doc.push_str("
");
+
if !input_arg_doc.is_empty() {
arg_doc.push_str("
");
}
- } else {
- arg_doc.push_str("
");
}
- arg_doc.push_str(&input_arg_doc);
+ if !input_arg_doc.is_empty() {
+ arg_doc.push_str(&format!("{input_arg_doc}
"));
+ }
props_docs.push(parse_quote! {
#[doc = #arg_doc]
From 85839abe5668a34c87a2d325ef2dd5a115ec7978 Mon Sep 17 00:00:00 2001
From: Leonard
Date: Tue, 24 Oct 2023 01:35:59 +0200
Subject: [PATCH 2/3] Fix random clippy warning
---
packages/desktop/src/protocol.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/desktop/src/protocol.rs b/packages/desktop/src/protocol.rs
index 53652f82f..3d51e3ac1 100644
--- a/packages/desktop/src/protocol.rs
+++ b/packages/desktop/src/protocol.rs
@@ -153,7 +153,7 @@ fn get_asset_root() -> Option {
/// Get the mime type from a path-like string
fn get_mime_from_path(trimmed: &Path) -> Result<&'static str> {
- if trimmed.ends_with(".svg") {
+ if trimmed.extension().is_some_and(|ext| ext == ".svg") {
return Ok("image/svg+xml");
}
From 613f2f9acaff5295395c7ce001cb41561203a6b6 Mon Sep 17 00:00:00 2001
From: Leonard
Date: Tue, 24 Oct 2023 01:41:46 +0200
Subject: [PATCH 3/3] Revert "Fix random clippy warning"
This reverts commit 85839abe5668a34c87a2d325ef2dd5a115ec7978.
---
packages/desktop/src/protocol.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/desktop/src/protocol.rs b/packages/desktop/src/protocol.rs
index 3d51e3ac1..53652f82f 100644
--- a/packages/desktop/src/protocol.rs
+++ b/packages/desktop/src/protocol.rs
@@ -153,7 +153,7 @@ fn get_asset_root() -> Option {
/// Get the mime type from a path-like string
fn get_mime_from_path(trimmed: &Path) -> Result<&'static str> {
- if trimmed.extension().is_some_and(|ext| ext == ".svg") {
+ if trimmed.ends_with(".svg") {
return Ok("image/svg+xml");
}