Skip to content

Commit 9bee4bd

Browse files
authored
Merge branch 'main' into main
2 parents 0440baf + cb8f156 commit 9bee4bd

20 files changed

Lines changed: 663 additions & 968 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ jobs:
8888
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
8989

9090
- name: Install Rust toolchain
91-
run: rustup update 1.63.0
91+
run: rustup update 1.85.0
9292

9393
- name: Version features
94-
run: cargo +1.63.0 build --manifest-path tests/smoke-test/Cargo.toml
94+
run: cargo +1.85.0 build --manifest-path tests/smoke-test/Cargo.toml
9595

9696
examples:
9797
name: Tests / Examples
@@ -186,18 +186,18 @@ jobs:
186186
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
187187

188188
- name: Install Rust Toolchain
189-
run: rustup update nightly
189+
run: rustup update nightly-2026-02-11
190190

191191
- name: Install Miri
192192
run: |
193-
rustup toolchain install nightly --component miri
194-
cargo +nightly miri setup
193+
rustup toolchain install nightly-2026-02-11 --component miri
194+
cargo +nightly-2026-02-11 miri setup
195195
196196
- name: Default features
197-
run: cargo +nightly miri test --lib --all-features
197+
run: cargo +nightly-2026-02-11 miri test --lib --all-features
198198

199199
- name: BE
200-
run: cargo +nightly miri test --target s390x-unknown-linux-gnu --lib --all-features
200+
run: cargo +nightly-2026-02-11 miri test --target s390x-unknown-linux-gnu --lib --all-features
201201

202202
clippy:
203203
name: Build / Clippy

Cargo.toml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ homepage = "https://github.com/uuid-rs/uuid"
2929
name = "uuid"
3030
readme = "README.md"
3131
repository = "https://github.com/uuid-rs/uuid"
32-
version = "1.19.0" # remember to update html_root_url in lib.rs
33-
rust-version = "1.81.0"
32+
version = "1.20.0" # remember to update html_root_url in lib.rs
33+
rust-version = "1.85.0"
3434

3535
[package.metadata.docs.rs]
3636
rustc-args = ["--cfg", "uuid_unstable"]
@@ -56,7 +56,8 @@ status = "actively-developed"
5656
[features]
5757
default = ["std"]
5858
std = ["wasm-bindgen?/std", "js-sys?/std"]
59-
macro-diagnostics = ["dep:uuid-macro-internal"]
59+
# Deprecated; now a no-op
60+
macro-diagnostics = []
6061

6162
# NOTE: When adding new features, check the `ci.yml` workflow
6263
# and include them where necessary (you can follow along with existing features)
@@ -85,7 +86,7 @@ borsh = ["dep:borsh", "dep:borsh-derive"]
8586

8687
# Public: Used in trait impls on `Uuid`
8788
[dependencies.bytemuck]
88-
version = "1.19.0"
89+
version = "1.20.0"
8990
optional = true
9091
features = ["derive"]
9192

@@ -133,13 +134,13 @@ default-features = false
133134
# Private
134135
# (Formally public)
135136
[target.'cfg(not(all(target_arch = "wasm32", any(target_os = "unknown", target_os = "none"))))'.dependencies.getrandom]
136-
version = "0.3"
137+
version = "0.4"
137138
optional = true
138139

139140
[target.'cfg(all(target_arch = "wasm32", any(target_os = "unknown", target_os = "none")))'.dependencies.uuid-rng-internal-lib]
140141
# Work-around lack of support for both `dep:x` and `x/` in MSRV
141142
package = "uuid-rng-internal"
142-
version = "1.19.0"
143+
version = "1.20.0"
143144
path = "rng"
144145
optional = true
145146

@@ -160,12 +161,6 @@ default-features = false
160161
optional = true
161162
version = "1"
162163

163-
# Public: Re-exported
164-
[dependencies.uuid-macro-internal]
165-
version = "1.19.0"
166-
path = "macros"
167-
optional = true
168-
169164
# Private
170165
[dependencies.atomic]
171166
default-features = false
@@ -185,9 +180,6 @@ default-features = false
185180
version = "0.3"
186181
optional = true
187182

188-
[dev-dependencies.bincode]
189-
version = "1.0"
190-
191183
[dev-dependencies.serde]
192184
version = "1.0.221"
193185

@@ -214,7 +206,6 @@ version = "1"
214206

215207
[workspace]
216208
members = [
217-
"macros",
218209
"rng",
219210
"examples",
220211
"tests/smoke-test",

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Add the following to your `Cargo.toml`:
2828

2929
```toml
3030
[dependencies.uuid]
31-
version = "1.19.0"
31+
version = "1.20.0"
3232
# Lets you generate random UUIDs
3333
features = [
3434
"v4",
@@ -64,11 +64,11 @@ assert_eq!(Some(Version::Random), my_uuid.get_version());
6464
If you'd like to parse UUIDs _really_ fast, check out the [`uuid-simd`](https://github.com/nugine/uuid-simd)
6565
library.
6666

67-
For more details on using `uuid`, [see the library documentation](https://docs.rs/uuid/1.19.0/uuid).
67+
For more details on using `uuid`, [see the library documentation](https://docs.rs/uuid/1.20.0/uuid).
6868

6969
## References
7070

71-
* [`uuid` library docs](https://docs.rs/uuid/1.19.0/uuid).
71+
* [`uuid` library docs](https://docs.rs/uuid/1.20.0/uuid).
7272
* [Wikipedia: Universally Unique Identifier](http://en.wikipedia.org/wiki/Universally_unique_identifier).
7373
* [RFC 9562: Universally Unique IDentifiers (UUID)](https://www.ietf.org/rfc/rfc9562.html).
7474

examples/src/uuid_macro.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
//! `uuid!` will parse encoded UUIDs at compile time instead of at runtime.
44
//! If you've got a fixed UUID string handy then consider using `uuid!` instead
55
//! of `Uuid::parse_str` or `str::parse`.
6-
//!
7-
//! If you enable the `macro-diagnostics` feature, you can see much better
8-
//! error messages.
96
107
fn main() {
118
use uuid::uuid;

macros/COPYRIGHT

Lines changed: 0 additions & 7 deletions
This file was deleted.

macros/Cargo.toml

Lines changed: 0 additions & 30 deletions
This file was deleted.

macros/LICENSE-APACHE

Lines changed: 0 additions & 201 deletions
This file was deleted.

0 commit comments

Comments
 (0)