Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: uuid-rs/uuid
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.3.3
Choose a base ref
...
head repository: uuid-rs/uuid
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.3.4
Choose a head ref
  • 11 commits
  • 17 files changed
  • 4 contributors

Commits on May 27, 2023

  1. Add wasm32-wasi support with tests

    @sunfishcode added `wasm32-wasi` support in #477, but somewhere along the way it appears to have
    been broken or dropped. Thankfully, the reason for the breakage doesn't appear too deep: the
    `wasm-bindgen` support was enabled for all `wasm32` architectures, rather than just the
    `wasm32-unknown-unknown` target triple that [`wasm-bindgen`
    supports](https://rustwasm.github.io/wasm-bindgen/reference/rust-targets.html).
    
    This PR fixes the `cfg` expressions for `wasm-bindgen`-specific code so that they no longer catch
    `wasm32-wasi`, and now `wasm32-wasi` just works 🎉
    
    To guard against future breakage, I added some `wasm32-wasi` testing infrastructure. A new CI
    target modeled on the `wasm-bindgen` target tests the `wasm32-wasi` implementation against
    `wasmtime`. Since test runners can't be specified at the command line, this requires a
    `.cargo/config` addition as well.
    
    I also noticed and fixed a typo in the existing `wasm-bindgen` CI target that I believe has been
    causing the tests to not run with any of the version features enabled.
    acfoltzer committed May 27, 2023
    Copy the full SHA
    f2ca3d4 View commit details
  2. Copy the full SHA
    f74e05e View commit details
  3. Copy the full SHA
    403f845 View commit details

Commits on May 28, 2023

  1. Merge pull request #677 from acfoltzer/wasm32-wasi

    Add `wasm32-wasi` support with tests
    KodrAus authored May 28, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a0d6eb6 View commit details
  2. fix up MSRV build in CI

    KodrAus committed May 28, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b466522 View commit details
  3. Just check v4 for MSRV

    KodrAus authored May 28, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e582a3d View commit details
  4. Merge pull request #679 from uuid-rs/ci/msrv-build

    Fix up MSRV build in CI
    KodrAus authored May 28, 2023
    Copy the full SHA
    6188ecf View commit details

Commits on Jun 12, 2023

  1. Copy the full SHA
    3af4733 View commit details

Commits on Jun 13, 2023

  1. Merge pull request #682 from Hanaasagi/fix-index

    fix: keep the order when filling random bytes
    KodrAus authored Jun 13, 2023
    Copy the full SHA
    4297536 View commit details
  2. prepare for 1.3.4 release

    KodrAus committed Jun 13, 2023
    Copy the full SHA
    80ec18c View commit details
  3. Merge pull request #683 from uuid-rs/cargo/1.3.4

    Prepare for 1.3.4 release
    KodrAus authored Jun 13, 2023
    Copy the full SHA
    07052be View commit details
Showing with 145 additions and 89 deletions.
  1. +2 −0 .cargo/config
  2. +30 −5 .github/workflows/ci.yml
  3. +6 −5 Cargo.toml
  4. +3 −3 README.md
  5. +1 −1 macros/Cargo.toml
  6. +64 −47 src/lib.rs
  7. +3 −3 src/timestamp.rs
  8. +4 −4 src/v1.rs
  9. +3 −3 src/v3.rs
  10. +3 −3 src/v4.rs
  11. +4 −4 src/v5.rs
  12. +4 −4 src/v6.rs
  13. +5 −5 src/v7.rs
  14. +2 −2 src/v8.rs
  15. +1 −0 tests/smoke-test/.gitignore
  16. +9 −0 tests/smoke-test/Cargo.toml
  17. +1 −0 tests/smoke-test/src/main.rs
2 changes: 2 additions & 0 deletions .cargo/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[target.wasm32-wasi]
runner = "wasmtime"
35 changes: 30 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ jobs:
run: cargo test --all-features

msrv:
name: "Tests / MSRV"
name: "Build / MSRV"
runs-on: ubuntu-latest
steps:
- name: Checkout sources
@@ -88,10 +88,10 @@ jobs:
run: rustup update 1.57.0

- name: Version features
run: cargo +1.57.0 test --features "$VERSION_FEATURES"
run: cargo +1.57.0 build --manifest-path tests/smoke-test/Cargo.toml

wasm:
name: Tests / WebAssembly
wasm_bindgen:
name: Tests / WebAssembly (wasm-bindgen)
runs-on: ubuntu-latest
steps:
- name: Checkout sources
@@ -104,11 +104,36 @@ jobs:
run: wasm-pack test --node

- name: Version features
run: wasm-pack test --node -- --features "$VERION_FEATURES $DEP_FEATURES js"
run: wasm-pack test --node -- --features "$VERSION_FEATURES $DEP_FEATURES js"

- name: Fast RNG
run: wasm-pack test --node -- --features "js v4 fast-rng"

wasi:
name: Tests / WebAssembly (WASI)
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab

- name: Install Wasmtime
run: curl https://wasmtime.dev/install.sh -sSf | bash

- name: Add Wasmtime to path
run: echo "$HOME/.wasmtime/bin" >> $GITHUB_PATH

- name: Install wasm32-wasi target
run: rustup target add wasm32-wasi

- name: Default features
run: cargo test --target wasm32-wasi

- name: Version features
run: cargo test --target wasm32-wasi --features "$VERSION_FEATURES $DEP_FEATURES"

- name: Fast RNG
run: cargo test --target wasm32-wasi --features "v4 fast-rng"

mips:
name: Tests / MIPS (Big Endian)
runs-on: ubuntu-latest
11 changes: 6 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ homepage = "https://github.com/uuid-rs/uuid"
name = "uuid"
readme = "README.md"
repository = "https://github.com/uuid-rs/uuid"
version = "1.3.3" # remember to update html_root_url in lib.rs
version = "1.3.4" # remember to update html_root_url in lib.rs

[package.metadata.docs.rs]
rustc-args = ["--cfg", "uuid_unstable"]
@@ -134,7 +134,7 @@ version = "1"
# Use the `macro-diagnostics` feature instead
[dependencies.uuid-macro-internal]
package = "uuid-macro-internal"
version = "1.3.3"
version = "1.3.4"
path = "macros"
optional = true

@@ -161,11 +161,11 @@ version = "1.0"
[dev-dependencies.serde_test]
version = "1.0.56"

[target.'cfg(target_arch = "wasm32")'.dev-dependencies.wasm-bindgen]
[target.'cfg(target = "wasm32-unknown-unknown")'.dev-dependencies.wasm-bindgen]
package = "wasm-bindgen"
version = "0.2"

[target.'cfg(target_arch = "wasm32")'.dev-dependencies.wasm-bindgen-test]
[target.'cfg(target = "wasm32-unknown-unknown")'.dev-dependencies.wasm-bindgen-test]
version = "0.3"

[dev-dependencies.trybuild]
@@ -180,5 +180,6 @@ features = ["Win32_System_Com"]

[workspace]
members = [
"macros"
"macros",
"tests/smoke-test",
]
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ Add the following to your `Cargo.toml`:

```toml
[dependencies.uuid]
version = "1.3.3"
version = "1.3.4"
features = [
"v4", # Lets you generate random UUIDs
"fast-rng", # Use a faster (but still sufficiently random) RNG
@@ -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.3.3/uuid).
For more details on using `uuid`, [see the library documentation](https://docs.rs/uuid/1.3.4/uuid).

## Minimum Supported Rust Version (MSRV)

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

## References

* [`uuid` library docs](https://docs.rs/uuid/1.3.3/uuid).
* [`uuid` library docs](https://docs.rs/uuid/1.3.4/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).

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.3.3"
version = "1.3.4"
edition = "2018"
authors = [
"QnnOkabayashi"
Loading