Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

leptos 0.6: Switch to proc-macro-error2 to address unmaintained security advisory. #2935

Merged
merged 1 commit into from
Sep 6, 2024
Merged

leptos 0.6: Switch to proc-macro-error2 to address unmaintained security advisory. #2935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion leptos_macro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ cfg-if = "1"
html-escape = "0.2"
itertools = "0.12"
prettyplease = "0.2.4"
proc-macro-error = { version = "1", default-features = false }
proc-macro-error2 = { version = "2", default-features = false }
proc-macro2 = "1"
quote = "1"
syn = { version = "2", features = ["full"] }
Expand Down
2 changes: 1 addition & 1 deletion leptos_macro/src/component.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ impl ToTokens for Model {
_ => None,
});
if let Some(semi) = ends_semi {
proc_macro_error::emit_error!(
proc_macro_error2::emit_error!(
semi.span(),
"A component that ends with a `view!` macro followed by a \
semicolon will return (), an empty view. This is usually \
Expand Down
12 changes: 6 additions & 6 deletions leptos_macro/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#![allow(private_macro_use)]

#[macro_use]
extern crate proc_macro_error;
extern crate proc_macro_error2;

use component::DummyModel;
use proc_macro::TokenStream;
Expand Down Expand Up @@ -313,7 +313,7 @@ mod slot;
/// # ;
/// # }
/// ```
#[proc_macro_error::proc_macro_error]
#[proc_macro_error2::proc_macro_error]
#[proc_macro]
#[cfg_attr(
any(debug_assertions, feature = "ssr"),
Expand Down Expand Up @@ -391,7 +391,7 @@ fn normalized_call_site(site: proc_macro::Span) -> Option<String> {
/// syntax as the [view!] macro. In hydration or server-side rendering mode,
/// behaves exactly as the `view` macro. In client-side rendering mode, uses a `<template>`
/// node to efficiently render the element. Should only be used with a single root element.
#[proc_macro_error::proc_macro_error]
#[proc_macro_error2::proc_macro_error]
#[proc_macro]
pub fn template(tokens: TokenStream) -> TokenStream {
if cfg!(feature = "csr") {
Expand Down Expand Up @@ -583,7 +583,7 @@ pub fn template(tokens: TokenStream) -> TokenStream {
/// }
/// }
/// ```
#[proc_macro_error::proc_macro_error]
#[proc_macro_error2::proc_macro_error]
#[proc_macro_attribute]
pub fn component(args: proc_macro::TokenStream, s: TokenStream) -> TokenStream {
let is_transparent = if !args.is_empty() {
Expand Down Expand Up @@ -699,7 +699,7 @@ pub fn component(args: proc_macro::TokenStream, s: TokenStream) -> TokenStream {
/// }
/// }
/// ```
#[proc_macro_error::proc_macro_error]
#[proc_macro_error2::proc_macro_error]
#[proc_macro_attribute]
pub fn island(_args: proc_macro::TokenStream, s: TokenStream) -> TokenStream {
let Ok(mut dummy) = syn::parse::<DummyModel>(s.clone()) else {
Expand Down Expand Up @@ -839,7 +839,7 @@ pub fn island(_args: proc_macro::TokenStream, s: TokenStream) -> TokenStream {
/// }
/// }
/// ```
#[proc_macro_error::proc_macro_error]
#[proc_macro_error2::proc_macro_error]
#[proc_macro_attribute]
pub fn slot(args: proc_macro::TokenStream, s: TokenStream) -> TokenStream {
if !args.is_empty() {
Expand Down
8 changes: 4 additions & 4 deletions leptos_macro/src/view/client_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ pub(crate) fn node_to_tokens(
Node::RawText(r) => {
let text = r.to_string_best();
if text == "cx," {
proc_macro_error::abort!(
proc_macro_error2::abort!(
r.span(),
"`cx,` is not used with the `view!` macro in 0.5."
)
Expand Down Expand Up @@ -185,7 +185,7 @@ pub(crate) fn element_to_tokens(
match parent_type {
TagType::Unknown => {
// We decided this warning was too aggressive, but I'll leave it here in case we want it later
/* proc_macro_error::emit_warning!(name.span(), "The view macro is assuming this is an HTML element, \
/* proc_macro_error2::emit_warning!(name.span(), "The view macro is assuming this is an HTML element, \
but it is ambiguous; if it is an SVG or MathML element, prefix with svg:: or math::"); */
quote! {
::leptos::leptos_dom::html::#name()
Expand Down Expand Up @@ -282,7 +282,7 @@ pub(crate) fn element_to_tokens(
};

if is_self_closing(node) && !node.children.is_empty() {
proc_macro_error::abort!(
proc_macro_error2::abort!(
node.name().span(),
format!(
"<{tag}> is a self-closing tag and cannot have children."
Expand Down Expand Up @@ -470,7 +470,7 @@ pub(crate) fn attribute_to_tokens(
&& node.value().and_then(value_to_string).is_none()
{
let span = node.key.span();
proc_macro_error::emit_error!(span, "Combining a global class (view! { class = ... }) \
proc_macro_error2::emit_error!(span, "Combining a global class (view! { class = ... }) \
and a dynamic `class=` attribute on an element causes runtime inconsistencies. You can \
toggle individual classes dynamically with the `class:name=value` syntax. \n\nSee this issue \
for more information and an example: https://github.com/leptos-rs/leptos/issues/773")
Expand Down
2 changes: 1 addition & 1 deletion leptos_macro/src/view/client_template.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ fn child_to_tokens(
match node {
Node::Element(node) => {
if is_component_node(node) {
proc_macro_error::emit_error!(
proc_macro_error2::emit_error!(
node.name().span(),
"component children not allowed in template!, use view! \
instead"
Expand Down
2 changes: 1 addition & 1 deletion leptos_macro/src/view/ide_helper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ impl IdeTagHelper {
/// Emit warning if tag is component.
pub fn save_tag_completion(&mut self, name: &NodeName) {
if is_component_tag_name(name) {
proc_macro_error::emit_warning!(
proc_macro_error2::emit_warning!(
name.span(),
"BUG: Component tag is used in regular tag completion."
);
Expand Down
12 changes: 6 additions & 6 deletions leptos_macro/src/view/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ fn fancy_class_name<'a>(
}

_ => {
proc_macro_error::emit_error!(
proc_macro_error2::emit_error!(
elem.span(),
"class name elements must be string \
literals"
Expand All @@ -459,7 +459,7 @@ fn fancy_class_name<'a>(
}

_ => {
proc_macro_error::emit_error!(
proc_macro_error2::emit_error!(
class_name.span(),
"class name must be a string literal or array of \
string literals"
Expand All @@ -475,7 +475,7 @@ fn fancy_class_name<'a>(
}
}
} else {
proc_macro_error::emit_error!(
proc_macro_error2::emit_error!(
tuple.span(),
"class tuples must have two elements."
)
Expand All @@ -496,7 +496,7 @@ fn ident_from_tag_name(tag_name: &NodeName) -> Ident {
.expect("element needs to have a name"),
NodeName::Block(_) => {
let span = tag_name.span();
proc_macro_error::emit_error!(
proc_macro_error2::emit_error!(
span,
"blocks not allowed in tag-name position"
);
Expand Down Expand Up @@ -529,7 +529,7 @@ fn fancy_style_name<'a>(
{
s.value()
} else {
proc_macro_error::emit_error!(
proc_macro_error2::emit_error!(
style_name.span(),
"style name must be a string literal"
);
Expand All @@ -544,7 +544,7 @@ fn fancy_style_name<'a>(
value,
));
} else {
proc_macro_error::emit_error!(
proc_macro_error2::emit_error!(
tuple.span(),
"style tuples must have two elements."
)
Expand Down
2 changes: 1 addition & 1 deletion leptos_macro/src/view/server_template.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ fn attribute_to_tokens_ssr<'a>(
&& attr.value().and_then(value_to_string).is_none()
{
let span = attr.key.span();
proc_macro_error::emit_error!(span, "Combining a global class (view! { class = ... }) \
proc_macro_error2::emit_error!(span, "Combining a global class (view! { class = ... }) \
and a dynamic `class=` attribute on an element causes runtime inconsistencies. You can \
toggle individual classes dynamically with the `class:name=value` syntax. \n\nSee this issue \
for more information and an example: https://github.com/leptos-rs/leptos/issues/773")
Expand Down
2 changes: 1 addition & 1 deletion leptos_macro/src/view/slot_helper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pub(crate) fn slot_to_tokens(
let component_name = ident_from_tag_name(node.name());

let Some(parent_slots) = parent_slots else {
proc_macro_error::emit_error!(
proc_macro_error2::emit_error!(
node.name().span(),
"slots cannot be used inside HTML elements"
);
Expand Down