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

Jump to bottom

Update atomic and zerocopy to latest #750

Merged
merged 1 commit into from
Mar 21, 2024
Merged

Update atomic and zerocopy to latest #750

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
5 changes: 3 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ version = "1.1.3"
# See: https://github.com/uuid-rs/uuid/issues/588
[dependencies.zerocopy]
optional = true
version = "0.6"
version = "0.7"
features = ["derive"]

# Public: Used in trait impls on `Uuid`
[dependencies.borsh]
Expand Down Expand Up @@ -154,7 +155,7 @@ optional = true
[dependencies.atomic]
default-features = false
optional = true
version = "0.5"
version = "0.6"

# Private
[target.'cfg(all(target_arch = "wasm32", target_vendor = "unknown", target_os = "unknown"))'.dependencies.wasm-bindgen]
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ extern crate std;
extern crate core as std;

#[cfg(all(uuid_unstable, feature = "zerocopy"))]
use zerocopy::{AsBytes, FromBytes, Unaligned};
use zerocopy::{AsBytes, FromBytes, FromZeroes, Unaligned};

mod builder;
mod error;
Expand Down Expand Up @@ -438,7 +438,7 @@ pub enum Variant {
#[derive(Clone, Copy, Eq, Hash, Ord, PartialEq, PartialOrd)]
#[cfg_attr(
all(uuid_unstable, feature = "zerocopy"),
derive(AsBytes, FromBytes, Unaligned)
derive(AsBytes, FromBytes, FromZeroes, Unaligned)
)]
#[cfg_attr(
feature = "borsh",
Expand Down
Loading