Skip to content

Commit

Permalink
Merge pull request #42 from meilisearch/upgrade-dependencies
Browse files Browse the repository at this point in the history
Upgrade dependencies
  • Loading branch information
irevoire authored Jan 8, 2025
2 parents 2906521 + d3daa37 commit 4fb6818
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv = "1.36.0"
msrv = "1.55.0"
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ edition = "2021"
[dependencies]
serde_json = { version = "1.0", optional = true }
serde-cs = { version = "0.2.4", optional = true }
actix-web = { version = "4.8.0", default-features = false, optional = true }
futures = { version = "0.3.30", optional = true }
actix-web = { version = "4.9.0", default-features = false, optional = true }
futures = { version = "0.3.31", optional = true }
deserr-internal = { version = "=0.6.3", path = "derive" }
strsim = "0.11.1"
actix-http = { version = "3.8.0", optional = true }
actix-http = { version = "3.9.0", optional = true }
actix-utils = { version = "3.0.1", optional = true }
serde_urlencoded = "0.7.1"

Expand All @@ -29,11 +29,11 @@ actix-web = ["dep:actix-web", "futures", "actix-http", "actix-utils"]

[dev-dependencies]
automod = "1.0"
insta = { version = "1.39.0", features = ["json"] }
insta = { version = "1.42.0", features = ["json"] }
rustversion = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_derive = "1.0"
trybuild = { version = "1.0.96", features = ["diff"] }
trybuild = { version = "1.0.101", features = ["diff"] }

[workspace]
members = ["derive", "examples/*"]
Expand Down
2 changes: 1 addition & 1 deletion derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ proc-macro = true

[dependencies]
proc-macro2 = "1.0"
quote = "1.0.36"
quote = "1.0.38"
syn = { version = "2.0", features=["extra-traits", "parsing"]}
convert_case = "0.6.0"

Expand Down
16 changes: 8 additions & 8 deletions examples/actix_web_server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
actix-http = { version = "3.8.0", default-features = false, features = ["compress-brotli", "compress-gzip", "rustls"] }
actix-web = { version = "4.8.0", default-features = false, features = ["macros", "compress-brotli", "compress-gzip", "cookies", "rustls"] }
anyhow = "1.0.86"
actix-http = { version = "3.9.0", default-features = false, features = ["compress-brotli", "compress-gzip", "rustls"] }
actix-web = { version = "4.9.0", default-features = false, features = ["macros", "compress-brotli", "compress-gzip", "cookies", "rustls"] }
anyhow = "1.0.95"
deserr = { path = "../../", features = ["actix-web"] }
env_logger = "0.11.3"
futures = "0.3.30"
futures-util = "0.3.30"
env_logger = "0.11.6"
futures = "0.3.31"
futures-util = "0.3.31"
log = "0.4.22"
serde = { version = "1.0.203", features = ["derive"] }
serde_json = "1.0.120"
serde = { version = "1.0.217", features = ["derive"] }
serde_json = "1.0.135"
7 changes: 2 additions & 5 deletions src/value.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pub enum ValuePointerRef<'a> {
},
}

impl<'a> Default for ValuePointerRef<'a> {
impl Default for ValuePointerRef<'_> {
fn default() -> Self {
Self::Origin
}
Expand All @@ -55,10 +55,7 @@ impl<'a> ValuePointerRef<'a> {

/// Return true if the pointer is at the origin.
pub fn is_origin(&self) -> bool {
match self {
ValuePointerRef::Origin => true,
_ => false,
}
matches!(self, ValuePointerRef::Origin)
}

/// Return the last field encountered if there is one.
Expand Down
4 changes: 2 additions & 2 deletions tests/attributes/from.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fn from_container_attribute() {

impl From<String> for AsciiString {
fn from(s: String) -> Self {
if s.chars().any(|c| !c.is_ascii()) {
if !s.is_ascii() {
Self::Invalid(s)
} else {
Self::Valid(s)
Expand Down Expand Up @@ -77,7 +77,7 @@ fn from_field_attribute() {

impl From<String> for AsciiString {
fn from(s: String) -> Self {
if s.chars().any(|c| !c.is_ascii()) {
if !s.is_ascii() {
Self::Invalid(s)
} else {
Self::Valid(s)
Expand Down
1 change: 1 addition & 0 deletions tests/regression/issue24.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ impl MergeWithError<MyError> for MyError {

#[derive(Deserr)]
#[deserr(error = MyError)]
#[allow(unused)]
pub struct Point {
pub x: u32,
pub y: u32,
Expand Down

0 comments on commit 4fb6818

Please sign in to comment.