Unverified Commit 0ca2f97c authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

fix broken extend implementation on DynamicStorage (#86204)

### What?

This implementation was broken. It did call `add` instead of `insert` and that doesn't override existing values as it should.

It could also be a bit more efficient by using `extend`.
parent cee71e4a
...@@ -61,14 +61,9 @@ impl DynamicStorage { ...@@ -61,14 +61,9 @@ impl DynamicStorage {
pub fn extend( pub fn extend(
&mut self, &mut self,
ty: CachedDataItemType, ty: CachedDataItemType,
item: impl Iterator<Item = CachedDataItem>, iterator: impl Iterator<Item = CachedDataItem>,
) -> bool { ) -> bool {
let map = self.get_or_create_map_mut(ty); self.get_or_create_map_mut(ty).extend(iterator)
let mut added = true;
for item in item {
added = map.add(item) && added;
}
added
} }
pub fn insert(&mut self, item: CachedDataItem) -> Option<CachedDataItemValue> { pub fn insert(&mut self, item: CachedDataItem) -> Option<CachedDataItemValue> {
......
...@@ -360,6 +360,20 @@ pub fn derive_key_value_pair(input: TokenStream) -> TokenStream { ...@@ -360,6 +360,20 @@ pub fn derive_key_value_pair(input: TokenStream) -> TokenStream {
} }
} }
pub fn extend(&mut self, iterator: impl Iterator<Item = #ident>) -> bool {
match self {
#(
#storage_name::#variant_names { storage } => {
storage.extend(iterator.map(|item| match item {
#storage_pattern => (#storage_key, value),
_ => unreachable!(),
}))
}
)*
_ => unreachable!(),
}
}
pub fn remove(&mut self, key: &#key_name) -> Option<#value_name> { pub fn remove(&mut self, key: &#key_name) -> Option<#value_name> {
match (self, *key) { match (self, *key) {
#( #(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment