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.

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

Update uuid, unicode-xid and base64 #1164

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 contrib/lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ glob = { version = "0.3", optional = true }
tera = { version = "0.11", optional = true }

# UUID dependencies.
uuid = { version = "0.7", optional = true }
uuid = { version = ">=0.7.0, <0.9.0", optional = true }

# Database dependencies
diesel = { version = "1.0", default-features = false, optional = true }
Expand Down
2 changes: 1 addition & 1 deletion contrib/lib/src/uuid.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use std::ops::Deref;
use rocket::request::{FromParam, FromFormValue};
use rocket::http::RawStr;

pub use self::uuid_crate::parser::ParseError;
type ParseError = <self::uuid_crate::Uuid as FromStr>::Err;

/// Implements [`FromParam`] and [`FromFormValue`] for accepting UUID values.
///
Expand Down
2 changes: 1 addition & 1 deletion core/http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ rustls = { version = "0.15", optional = true }
state = "0.4"
cookie = { version = "0.12", features = ["percent-encode"] }
pear = "0.1"
unicode-xid = "0.1"
unicode-xid = "0.2"

[dependencies.hyper-sync-rustls]
version = "=0.3.0-rc.5"
Expand Down
2 changes: 1 addition & 1 deletion core/lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ num_cpus = "1.0"
state = "0.4.1"
time = "0.1"
memchr = "2" # TODO: Use pear instead.
base64 = "0.10"
base64 = "0.11"
base16 = "0.2"
pear = "0.1"
atty = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion examples/uuid/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ publish = false
[dependencies]
rocket = { path = "../../core/lib" }
lazy_static = "1.0"
uuid = "0.7"
uuid = "0.8"

[dependencies.rocket_contrib]
default-features = false
Expand Down