Remove the dependency on `boolinator` (#3420)

* removed boolinator from dependencies of yew-macro

* removed boolinator from the dependencies of tools/website-test

* fixed formatting

* removed a lint fix

Cargo.lock

@@ -313,12 +313,6 @@ dependencies = [
  "yew",
 ]
 
-[[package]]
-name = "boolinator"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfa8873f51c92e232f9bac4065cddef41b714152812bfc5f7672ba16d6ef8cd9"
-
 [[package]]
 name = "bumpalo"
 version = "3.13.0"
@@ -3467,7 +3461,6 @@ dependencies = [
 name = "website-test"
 version = "0.1.0"
 dependencies = [
- "boolinator",
  "derive_more",
  "glob",
  "gloo 0.10.0",
@@ -3744,7 +3737,6 @@ dependencies = [
 name = "yew-macro"
 version = "0.21.0"
 dependencies = [
- "boolinator",
  "once_cell",
  "prettyplease",
  "proc-macro-error",

packages/yew-macro/Cargo.toml

@@ -16,7 +16,6 @@ rust-version = "1.64.0"
 proc-macro = true
 
 [dependencies]
-boolinator = "2"
 proc-macro-error = "1"
 proc-macro2 = "1"
 quote = "1"

packages/yew-macro/src/html_tree/html_dashed_name.rs

@@ -1,6 +1,5 @@
 use std::fmt;
 
-use boolinator::Boolinator;
 use proc_macro2::{Ident, Span, TokenStream};
 use quote::{quote, ToTokens};
 use syn::buffer::Cursor;
@@ -54,7 +53,9 @@ impl fmt::Display for HtmlDashedName {
 impl Peek<'_, Self> for HtmlDashedName {
     fn peek(cursor: Cursor) -> Option<(Self, Cursor)> {
         let (name, cursor) = cursor.ident()?;
-        non_capitalized_ascii(&name.to_string()).as_option()?;
+        if !non_capitalized_ascii(&name.to_string()) {
+            return None;
+        }
 
         let mut extended = Vec::new();
         let mut cursor = cursor;

packages/yew-macro/src/html_tree/html_element.rs

@@ -1,4 +1,3 @@
-use boolinator::Boolinator;
 use proc_macro2::{Delimiter, Span, TokenStream};
 use proc_macro_error::emit_warning;
 use quote::{quote, quote_spanned, ToTokens};
@@ -507,7 +506,9 @@ pub struct DynamicName {
 impl Peek<'_, ()> for DynamicName {
     fn peek(cursor: Cursor) -> Option<((), Cursor)> {
         let (punct, cursor) = cursor.punct()?;
-        (punct.as_char() == '@').as_option()?;
+        if punct.as_char() != '@' {
+            return None;
+        }
 
         // move cursor past block if there is one
         let cursor = cursor
@@ -607,7 +608,9 @@ impl HtmlElementOpen {
 impl PeekValue<TagKey> for HtmlElementOpen {
     fn peek(cursor: Cursor) -> Option<TagKey> {
         let (punct, cursor) = cursor.punct()?;
-        (punct.as_char() == '<').as_option()?;
+        if punct.as_char() != '<' {
+            return None;
+        }
 
         let (tag_key, cursor) = TagName::peek(cursor)?;
         if let TagKey::Lit(name) = &tag_key {
@@ -615,9 +618,11 @@ impl PeekValue<TagKey> for HtmlElementOpen {
             if name.to_string() == "key" {
                 let (punct, _) = cursor.punct()?;
                 // ... unless it isn't followed by a '='. `<key></key>` is a valid element!
-                (punct.as_char() != '=').as_option()?;
+                if punct.as_char() == '=' {
-            } else {
+                    return None;
-                non_capitalized_ascii(&name.to_string()).as_option()?;
+                }
+            } else if !non_capitalized_ascii(&name.to_string()) {
+                return None;
             }
         }
 
@@ -675,20 +680,22 @@ impl HtmlElementClose {
 impl PeekValue<TagKey> for HtmlElementClose {
     fn peek(cursor: Cursor) -> Option<TagKey> {
         let (punct, cursor) = cursor.punct()?;
-        (punct.as_char() == '<').as_option()?;
+        if punct.as_char() != '<' {
+            return None;
+        }
 
         let (punct, cursor) = cursor.punct()?;
-        (punct.as_char() == '/').as_option()?;
+        if punct.as_char() != '/' {
+            return None;
+        }
 
         let (tag_key, cursor) = TagName::peek(cursor)?;
-        if let TagKey::Lit(name) = &tag_key {
+        if matches!(&tag_key, TagKey::Lit(name) if !non_capitalized_ascii(&name.to_string())) {
-            non_capitalized_ascii(&name.to_string()).as_option()?;
+            return None;
         }
 
         let (punct, _) = cursor.punct()?;
-        (punct.as_char() == '>').as_option()?;
+        (punct.as_char() == '>').then_some(tag_key)
-
-        Some(tag_key)
     }
 }
 

packages/yew-macro/src/html_tree/html_if.rs

@@ -1,4 +1,3 @@
-use boolinator::Boolinator;
 use proc_macro2::TokenStream;
 use quote::{quote_spanned, ToTokens};
 use syn::buffer::Cursor;
@@ -19,7 +18,7 @@ pub struct HtmlIf {
 impl PeekValue<()> for HtmlIf {
     fn peek(cursor: Cursor) -> Option<()> {
         let (ident, _) = cursor.ident()?;
-        (ident == "if").as_option()
+        (ident == "if").then_some(())
     }
 }
 

packages/yew-macro/src/html_tree/html_iterable.rs

@@ -1,4 +1,3 @@
-use boolinator::Boolinator;
 use proc_macro2::TokenStream;
 use quote::{quote_spanned, ToTokens};
 use syn::buffer::Cursor;
@@ -14,7 +13,7 @@ pub struct HtmlIterable(Expr);
 impl PeekValue<()> for HtmlIterable {
     fn peek(cursor: Cursor) -> Option<()> {
         let (ident, _) = cursor.ident()?;
-        (ident == "for").as_option()
+        (ident == "for").then_some(())
     }
 }
 

packages/yew-macro/src/html_tree/html_list.rs

@@ -1,4 +1,3 @@
-use boolinator::Boolinator;
 use quote::{quote, quote_spanned, ToTokens};
 use syn::buffer::Cursor;
 use syn::parse::{Parse, ParseStream};
@@ -99,14 +98,16 @@ impl HtmlListOpen {
 impl PeekValue<()> for HtmlListOpen {
     fn peek(cursor: Cursor) -> Option<()> {
         let (punct, cursor) = cursor.punct()?;
-        (punct.as_char() == '<').as_option()?;
+        if punct.as_char() != '<' {
+            return None;
+        }
         // make sure it's either a property (key=value) or it's immediately closed
         if let Some((_, cursor)) = HtmlDashedName::peek(cursor) {
             let (punct, _) = cursor.punct()?;
-            (punct.as_char() == '=' || punct.as_char() == '?').as_option()
+            (punct.as_char() == '=' || punct.as_char() == '?').then_some(())
         } else {
             let (punct, _) = cursor.punct()?;
-            (punct.as_char() == '>').as_option()
+            (punct.as_char() == '>').then_some(())
         }
     }
 }
@@ -156,12 +157,16 @@ impl HtmlListClose {
 impl PeekValue<()> for HtmlListClose {
     fn peek(cursor: Cursor) -> Option<()> {
         let (punct, cursor) = cursor.punct()?;
-        (punct.as_char() == '<').as_option()?;
+        if punct.as_char() != '<' {
+            return None;
+        }
         let (punct, cursor) = cursor.punct()?;
-        (punct.as_char() == '/').as_option()?;
+        if punct.as_char() != '/' {
+            return None;
+        }
 
         let (punct, _) = cursor.punct()?;
-        (punct.as_char() == '>').as_option()
+        (punct.as_char() == '>').then_some(())
     }
 }
 impl Parse for HtmlListClose {

tools/website-test/Cargo.toml

@@ -10,7 +10,6 @@ rust-version = "1.62"
 yew-agent = { path = "../../packages/yew-agent/" }
 
 [dev-dependencies]
-boolinator = "2.4"
 derive_more = "0.99"
 gloo = "0.10"
 js-sys = "0.3"