Merge pull request #116 from aumetra/update-crates

Update crates and UI test
jprochazk · Jun 16, 2024 · 0c62b91 · 0c62b91
2 parents d15689a + 6b77f0f
commit 0c62b91
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 17 deletions.
diff --git a/deny.toml b/deny.toml
@@ -104,6 +104,7 @@ unlicensed = "deny"
 allow = [
     "MIT",
     "Apache-2.0",
+    "Unicode-3.0",
     "Unicode-DFS-2016",
     "Unlicense",
     "BSD-3-Clause",

diff --git a/garde/Cargo.toml b/garde/Cargo.toml
@@ -50,15 +50,15 @@ regex = { version = "1", default-features = false, features = [
     "std",
 ], optional = true }
 once_cell = { version = "1", optional = true }
-idna = { version = "0.3", optional = true }
+idna = { version = "1", optional = true }
 
 [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
 js-sys = { version = "0.3", optional = true }
 
 [dev-dependencies]
 trybuild = { version = "1.0" }
 insta = { version = "1.29" }
-owo-colors = { version = "3.5.0" }
+owo-colors = { version = "4" }
 glob = "0.3.1"
 serde_json = { version = "1.0.112", features = ["preserve_order"] }
 

diff --git a/garde/src/rules/email.rs b/garde/src/rules/email.rs
@@ -15,6 +15,8 @@
 use std::fmt::Display;
 use std::str::FromStr;
 
+use idna::AsciiDenyList;
+
 use super::pattern::Matcher;
 use super::AsStr;
 use crate::error::Error;
@@ -121,7 +123,7 @@ pub fn parse_email(s: &str) -> Result<(), InvalidEmail> {
 
         #[cfg(feature = "email-idna")]
         {
-            match idna::domain_to_ascii(domain) {
+            match idna::domain_to_ascii_cow(domain.as_bytes(), AsciiDenyList::URL) {
                 Ok(domain) => {
                     if !is_valid_domain(&domain) {
                         return Err(InvalidEmail::InvalidDomain);

diff --git a/garde/tests/ui/compile-fail/pattern_mismatched_types.stderr b/garde/tests/ui/compile-fail/pattern_mismatched_types.stderr
@@ -8,8 +8,8 @@ error[E0277]: the trait bound `&str: Matcher` is not satisfied
   |                     ^^^ the trait `Matcher` is not implemented for `&str`
   |
   = help: the following other types implement trait `Matcher`:
-            once_cell::sync::Lazy<T>
             Regex
+            once_cell::sync::Lazy<T>
 note: required by a bound in `garde::rules::pattern::apply`
  --> src/rules/pattern.rs
   |

diff --git a/integrations/axum_garde/Cargo.toml b/integrations/axum_garde/Cargo.toml
@@ -36,10 +36,10 @@ garde = { version = "0.19.0", path = "../../garde", features = [
   "derive",
 ] }
 axum = { version = "0.7", features = ["default", "macros"] }
-axum-test = { version = "14.1" }
+axum-test = { version = "14.10" }
 tokio = { version = "1.28", features = ["full"] }
 prost = { version = "0.12" }
-rstest = { version = "0.18" }
+rstest = { version = "0.21" }
 speculoos = { version = "0.11" }
 
 [[example]]

diff --git a/integrations/axum_garde/src/lib.rs b/integrations/axum_garde/src/lib.rs
@@ -12,7 +12,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,

diff --git a/xtask/Cargo.lock b/xtask/Cargo.lock
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -15,6 +15,6 @@ anyhow = { version = "1.0.72", features = ["backtrace"] }
 argp = "0.3"
 glob = { version = "0.3.1", default-features = false }
 semver = "1.0.18"
-toml_edit = { version = "0.19.14", features = ["perf"] }
+toml_edit = { version = "0.22.14", features = ["perf"] }
 
 [workspace]
diff --git a/xtask/src/crates.rs b/xtask/src/crates.rs
@@ -3,13 +3,13 @@ use std::fs;
 use std::path::{Path, PathBuf};
 
 use semver::{BuildMetadata, Prerelease};
-use toml_edit::Document;
+use toml_edit::DocumentMut;
 
 use crate::Result;
 
 pub struct Crate {
     path: PathBuf,
-    doc: Document,
+    doc: DocumentMut,
 }
 
 impl Crate {
@@ -22,7 +22,7 @@ impl Crate {
     pub fn from_str(path: impl AsRef<Path>, source: &str) -> Result<Self> {
         Ok(Self {
             path: path.as_ref().to_path_buf(),
-            doc: source.parse::<Document>()?,
+            doc: source.parse::<DocumentMut>()?,
         })
     }