Skip to content

Commit

Permalink
Merge pull request #634 from KodrAus/cargo/1.2.0
Browse files Browse the repository at this point in the history
Prepare for 1.2.0 release
  • Loading branch information
KodrAus authored Oct 8, 2022
2 parents 8df6494 + 2db1a64 commit 399e878
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 12 deletions.
11 changes: 7 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,16 @@ homepage = "https://github.com/uuid-rs/uuid"
name = "uuid"
readme = "README.md"
repository = "https://github.com/uuid-rs/uuid"
version = "1.1.2" # remember to update html_root_url in lib.rs
version = "1.2.0" # remember to update html_root_url in lib.rs

[package.metadata.docs.rs]
features = ["serde", "arbitrary", "slog", "v1", "v3", "v4", "v5"]
rustc-args = ["--cfg", "uuid_unstable"]
rustdoc-args = ["--cfg", "uuid_unstable"]
targets = ["x86_64-unknown-linux-gnu"]
features = ["serde", "arbitrary", "slog", "v1", "v3", "v4", "v5", "v6", "v7", "v8"]

[package.metadata.playground]
features = ["serde", "v1", "v3", "v4", "v5"]
features = ["serde", "v1", "v3", "v4", "v5", "v6", "v7", "v8"]

[badges.is-it-maintained-issue-resolution]
repository = "uuid-rs/uuid"
Expand Down Expand Up @@ -131,7 +134,7 @@ version = "1"
# Use the `macro-diagnostics` feature instead
[dependencies.uuid-macro-internal]
package = "uuid-macro-internal"
version = "1.1.2"
version = "1.2.0"
path = "macros"
optional = true

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Add the following to your `Cargo.toml`:

```toml
[dependencies.uuid]
version = "1.1.2"
version = "1.2.0"
features = [
"v4", # Lets you generate random UUIDs
"fast-rng", # Use a faster (but still sufficiently random) RNG
Expand Down Expand Up @@ -66,7 +66,7 @@ assert_eq!(Some(Version::Random), my_uuid.get_version());
If you'd like to parse UUIDs _really_ fast, check out the [`uuid-simd`](https://github.com/nugine/uuid-simd)
library.

For more details on using `uuid`, [see the library documentation](https://docs.rs/uuid/1.1.2/uuid).
For more details on using `uuid`, [see the library documentation](https://docs.rs/uuid/1.2.0/uuid).

## Minimum Supported Rust Version (MSRV)

Expand All @@ -75,7 +75,7 @@ CI. It may be bumped in minor releases as necessary.

## References

* [`uuid` library docs](https://docs.rs/uuid/1.1.2/uuid).
* [`uuid` library docs](https://docs.rs/uuid/1.2.0/uuid).
* [Wikipedia: Universally Unique Identifier](http://en.wikipedia.org/wiki/Universally_unique_identifier).
* [RFC4122: A Universally Unique IDentifier (UUID) URN Namespace](http://tools.ietf.org/html/rfc4122).

Expand Down
2 changes: 1 addition & 1 deletion macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "uuid-macro-internal"
version = "1.1.2"
version = "1.2.0"
edition = "2018"
authors = [
"QnnOkabayashi"
Expand Down
8 changes: 4 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
//!
//! ```toml
//! [dependencies.uuid]
//! version = "1.1.2"
//! version = "1.2.0"
//! features = [
//! "v4", # Lets you generate random UUIDs
//! "fast-rng", # Use a faster (but still sufficiently random) RNG
Expand Down Expand Up @@ -138,7 +138,7 @@
//!
//! ```toml
//! [dependencies.uuid]
//! version = "1.1.2"
//! version = "1.2.0"
//! features = [
//! "v4",
//! "v7",
Expand All @@ -153,7 +153,7 @@
//!
//! ```toml
//! [dependencies.uuid]
//! version = "1.1.2"
//! version = "1.2.0"
//! default-features = false
//! ```
//!
Expand Down Expand Up @@ -211,7 +211,7 @@
#![doc(
html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "https://www.rust-lang.org/favicon.ico",
html_root_url = "https://docs.rs/uuid/1.1.2"
html_root_url = "https://docs.rs/uuid/1.2.0"
)]

#[cfg(any(feature = "std", test))]
Expand Down
16 changes: 16 additions & 0 deletions src/v7.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,22 @@ mod tests {
assert_eq!(uuid.get_variant(), Variant::RFC4122);
}

#[test]
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
fn test_sorting() {
let time1: u64 = 1_496_854_535;
let time_fraction1: u32 = 812_000_000;

let time2 = time1 + 4000;
let time_fraction2 = time_fraction1;

let uuid1 = Uuid::new_v7(Timestamp::from_unix(NoContext, time1, time_fraction1));
let uuid2 = Uuid::new_v7(Timestamp::from_unix(NoContext, time2, time_fraction2));

assert!(uuid1.as_bytes() < uuid2.as_bytes());
assert!(uuid1.to_string() < uuid2.to_string());
}

#[test]
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
fn test_new_timestamp_roundtrip() {
Expand Down

0 comments on commit 399e878

Please sign in to comment.