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

Fix Box<dyn Reflect> struct with a hashmap in it panicking when clone_value is called on it #8184

Merged
merged 9 commits into from
Apr 22, 2023
Merged

Fix Box<dyn Reflect> struct with a hashmap in it panicking when clone_value is called on it #8184

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a1bd6b8
Merge pull request #1 from bevyengine/main
NoahShomette Oct 5, 2022
29717a8
Merge branch 'main' of https://github.com/NoahShomette/bevy
NoahShomette Jan 29, 2023
c107f08
Merge branch 'main' of https://github.com/NoahShomette/bevy
NoahShomette Mar 23, 2023
6d7788e
Merge branch 'main' of https://github.com/NoahShomette/bevy
NoahShomette Mar 23, 2023
f8d7f9f
update clone_dynamic in bevy_reflect hashmap impl to use take_from_re…
NoahShomette Mar 23, 2023
d6da441
attempt fix
NoahShomette Mar 23, 2023
e281827
test fix
NoahShomette Mar 23, 2023
e28b796
test newer fix
NoahShomette Mar 23, 2023
6736589
Fix fmt error
NoahShomette Mar 23, 2023
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
5 changes: 4 additions & 1 deletion crates/bevy_reflect/src/impls/std.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,10 @@ macro_rules! impl_reflect_for_hashmap {
let mut dynamic_map = DynamicMap::default();
dynamic_map.set_name(self.type_name().to_string());
for (k, v) in self {
dynamic_map.insert_boxed(k.clone_value(), v.clone_value());
let key = K::from_reflect(k).unwrap_or_else(|| {
panic!("Attempted to clone invalid key of type {}.", k.type_name())
});
dynamic_map.insert_boxed(Box::new(key), v.clone_value());
}
dynamic_map
}
Expand Down