Skip to content

update rust toolchain to 1.97 #93

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

Merged
sunshowers merged 2 commits into from
Jul 30, 2026
+166 −40
Merged

update rust toolchain to 1.97 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a37224
[spr] initial version
sunshowers Jul 29, 2026
261ad96
update newtype-uuid
sunshowers Jul 30, 2026
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
126 changes: 116 additions & 10 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 47 additions & 27 deletions daft-derive/tests/fixtures/invalid/struct-field-not-diffable.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@ error[E0277]: the trait bound `NonDiffable: Diffable` is not satisfied
--> tests/fixtures/invalid/struct-field-not-diffable.rs:8:5
|
8 | b: NonDiffable,
| ^ the trait `Diffable` is not implemented for `NonDiffable`
| ^ unsatisfied trait bound
|
help: the trait `Diffable` is not implemented for `NonDiffable`
--> tests/fixtures/invalid/struct-field-not-diffable.rs:3:1
|
3 | struct NonDiffable {}
| ^^^^^^^^^^^^^^^^^^
= help: the following other types implement trait `Diffable`:
&'a T
()
Expand All @@ -19,8 +24,13 @@ error[E0277]: the trait bound `NonDiffable: Diffable` is not satisfied
--> tests/fixtures/invalid/struct-field-not-diffable.rs:5:10
|
5 | #[derive(Diffable)]
| ^^^^^^^^ the trait `Diffable` is not implemented for `NonDiffable`
| ^^^^^^^^ unsatisfied trait bound
|
help: the trait `Diffable` is not implemented for `NonDiffable`
--> tests/fixtures/invalid/struct-field-not-diffable.rs:3:1
|
3 | struct NonDiffable {}
| ^^^^^^^^^^^^^^^^^^
= help: the following other types implement trait `Diffable`:
&'a T
()
Expand All @@ -36,39 +46,49 @@ error[E0277]: the trait bound `NonDiffable: Diffable` is not satisfied
error[E0277]: the trait bound `NonDiffable: Diffable` is not satisfied in `MyStructDiff<'__daft>`
--> tests/fixtures/invalid/struct-field-not-diffable.rs:5:10
|
5 | #[derive(Diffable)]
| ^^^^^^^^ within `MyStructDiff<'__daft>`, the trait `Diffable` is not implemented for `NonDiffable`
|
= help: the following other types implement trait `Diffable`:
&'a T
()
(A, B)
(A, B, C)
(A, B, C, D)
(A, B, C, D, E)
(A, B, C, D, E, F)
(A, B, C, D, E, F, G)
and $N others
5 | #[derive(Diffable)]
| ^^^^^^^^ unsatisfied trait bound
|
help: within `MyStructDiff<'__daft>`, the trait `Diffable` is not implemented for `NonDiffable`
--> tests/fixtures/invalid/struct-field-not-diffable.rs:3:1
|
3 | struct NonDiffable {}
| ^^^^^^^^^^^^^^^^^^
= help: the following other types implement trait `Diffable`:
&'a T
()
(A, B)
(A, B, C)
(A, B, C, D)
(A, B, C, D, E)
(A, B, C, D, E, F)
(A, B, C, D, E, F, G)
and $N others
note: required because it appears within the type `MyStructDiff<'__daft>`
--> tests/fixtures/invalid/struct-field-not-diffable.rs:5:10
|
5 | #[derive(Diffable)]
| ^^^^^^^^
--> tests/fixtures/invalid/struct-field-not-diffable.rs:5:10
|
5 | #[derive(Diffable)]
| ^^^^^^^^
note: required by a bound in `daft::Diffable::Diff`
--> $WORKSPACE/daft/src/diffable.rs
|
| / type Diff<'daft>
| | where
| | Self: 'daft;
| |____________________^ required by this bound in `Diffable::Diff`
= note: this error originates in the derive macro `Diffable` (in Nightly builds, run with -Z macro-backtrace for more info)
--> $WORKSPACE/daft/src/diffable.rs
|
| / type Diff<'daft>
| | where
| | Self: 'daft;
| |____________________^ required by this bound in `Diffable::Diff`
= note: this error originates in the derive macro `Diffable` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0277]: the trait bound `NonDiffable: Diffable` is not satisfied in `MyStructDiff<'__daft>`
--> tests/fixtures/invalid/struct-field-not-diffable.rs:5:10
|
5 | #[derive(Diffable)]
| ^^^^^^^^ within `MyStructDiff<'__daft>`, the trait `Diffable` is not implemented for `NonDiffable`
| ^^^^^^^^ unsatisfied trait bound
|
help: within `MyStructDiff<'__daft>`, the trait `Diffable` is not implemented for `NonDiffable`
--> tests/fixtures/invalid/struct-field-not-diffable.rs:3:1
|
3 | struct NonDiffable {}
| ^^^^^^^^^^^^^^^^^^
= help: the following other types implement trait `Diffable`:
&'a T
()
Expand Down
4 changes: 2 additions & 2 deletions daft/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,9 +421,9 @@ Implementations for standard library types, all **enabled** by default:

Implementations for third-party types, all **disabled** by default:

* `uuid1`: Enable diffing for [`uuid::Uuid`](https://docs.rs/uuid/1.12.1/uuid/struct.Uuid.html).
* `uuid1`: Enable diffing for [`uuid::Uuid`](https://docs.rs/uuid/1.24.0/uuid/struct.Uuid.html).
* `oxnet01`: Enable diffing for network types from the [`oxnet`](https://docs.rs/oxnet/0.1.0/oxnet/index.html) crate.
* `newtype-uuid1`: Enable diffing for [`newtype_uuid::TypedUuid`](https://docs.rs/newtype-uuid/1.2.1/newtype_uuid/struct.TypedUuid.html).
* `newtype-uuid1`: Enable diffing for [`newtype_uuid::TypedUuid`](https://docs.rs/newtype-uuid/1.3.2/newtype_uuid/struct.TypedUuid.html).

## Minimum supported Rust version (MSRV)

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# The intent is to keep this updated as new stable versions are relased.

[toolchain]
channel = "1.88.0"
channel = "1.97.1"
profile = "default"
Loading