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

[Merged by Bors] - revert supporting generics for deriving TypeUuid #2204

Closed
wants to merge 1 commit into from
Closed

[Merged by Bors] - revert supporting generics for deriving TypeUuid #2204

wants to merge 1 commit into from

Conversation

NathanSWard
Copy link
Contributor

This reverts some of the changes made in #2044 as supporting generics for a #[derive(TypeUuid)] should not work as each generic instantiation would have the same uuid.

Stems from this conversation

@alice-i-cecile alice-i-cecile added C-Bug An unexpected or incorrect behavior A-Core Common functionality for all bevy apps labels May 17, 2021
@NathanSWard NathanSWard force-pushed the nward/type-uuid-revent-generic-derive branch from 6988479 to d547322 Compare May 17, 2021 19:44
@NathanSWard NathanSWard force-pushed the nward/type-uuid-revent-generic-derive branch from d547322 to 9c32164 Compare May 17, 2021 19:50
@cart
Copy link
Member

cart commented May 17, 2021

bors r+

bors bot pushed a commit that referenced this pull request May 17, 2021
@NathanSWard
revert supporting generics for deriving TypeUuid (#2204)
0719659 
This reverts some of the changes made in #2044 as supporting generics for a `#[derive(TypeUuid)]` should not work as each generic instantiation would have the same uuid.

Stems from [this conversation](#2044 (comment))
@bors
Copy link
Contributor

bors bot commented May 17, 2021

Pull request successfully merged into main.

Build succeeded:

@bors bors bot changed the title revert supporting generics for deriving TypeUuid [Merged by Bors] - revert supporting generics for deriving TypeUuid May 17, 2021
@bors bors bot closed this May 17, 2021
@NathanSWard NathanSWard mentioned this pull request May 17, 2021
Closed
ostwilkens pushed a commit to ostwilkens/bevy that referenced this pull request Jul 27, 2021
@NathanSWard @ostwilkens
revert supporting generics for deriving TypeUuid (bevyengine#2204)
95f8944 
This reverts some of the changes made in bevyengine#2044 as supporting generics for a `#[derive(TypeUuid)]` should not work as each generic instantiation would have the same uuid.

Stems from [this conversation](bevyengine#2044 (comment))
@jakobhellermann jakobhellermann mentioned this pull request Mar 5, 2022
Closed
bors bot pushed a commit that referenced this pull request Apr 26, 2022
@jakobhellermann @XBagon
re-enable #[derive(TypeUuid)] for generics (#4118)
3d36ec4 
Support for deriving `TypeUuid` for types with generics was initially added in #2044 but later reverted #2204 because it lead to `MyStruct<A>` and `MyStruct<B>` having the same type uuid.

This PR fixes this by generating code like
```rust
#[derive(TypeUuid)]
#[uuid = "69b09733-a21a-4dab-a444-d472986bd672"]
struct Type<T>(T);

impl<T: TypeUuid> TypeUuid for Type<T> {
  const TYPE_UUID: TypeUuid = generate_compound_uuid(Uuid::from_bytes([/* 69b0 uuid */]), T::TYPE_UUID);
}
```

where `generate_compound_uuid` will XOR the non-metadata bits of the two UUIDs.

Co-authored-by: XBagon <[email protected]>
Co-authored-by: Jakob Hellermann <[email protected]>
exjam pushed a commit to exjam/bevy that referenced this pull request May 22, 2022
@jakobhellermann @XBagon @exjam
re-enable #[derive(TypeUuid)] for generics (bevyengine#4118)
6ba61e0 
Support for deriving `TypeUuid` for types with generics was initially added in bevyengine#2044 but later reverted bevyengine#2204 because it lead to `MyStruct<A>` and `MyStruct<B>` having the same type uuid.

This PR fixes this by generating code like
```rust
#[derive(TypeUuid)]
#[uuid = "69b09733-a21a-4dab-a444-d472986bd672"]
struct Type<T>(T);

impl<T: TypeUuid> TypeUuid for Type<T> {
  const TYPE_UUID: TypeUuid = generate_compound_uuid(Uuid::from_bytes([/* 69b0 uuid */]), T::TYPE_UUID);
}
```

where `generate_compound_uuid` will XOR the non-metadata bits of the two UUIDs.

Co-authored-by: XBagon <[email protected]>
Co-authored-by: Jakob Hellermann <[email protected]>
ItsDoot pushed a commit to ItsDoot/bevy that referenced this pull request Feb 1, 2023
@jakobhellermann @XBagon @ItsDoot
re-enable #[derive(TypeUuid)] for generics (bevyengine#4118)
c621a0b 
Support for deriving `TypeUuid` for types with generics was initially added in bevyengine#2044 but later reverted bevyengine#2204 because it lead to `MyStruct<A>` and `MyStruct<B>` having the same type uuid.

This PR fixes this by generating code like
```rust
#[derive(TypeUuid)]
#[uuid = "69b09733-a21a-4dab-a444-d472986bd672"]
struct Type<T>(T);

impl<T: TypeUuid> TypeUuid for Type<T> {
  const TYPE_UUID: TypeUuid = generate_compound_uuid(Uuid::from_bytes([/* 69b0 uuid */]), T::TYPE_UUID);
}
```

where `generate_compound_uuid` will XOR the non-metadata bits of the two UUIDs.

Co-authored-by: XBagon <[email protected]>
Co-authored-by: Jakob Hellermann <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-Core Common functionality for all bevy apps C-Bug An unexpected or incorrect behavior
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@NathanSWard @cart @alice-i-cecile