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 formatting #107

Merged
merged 1 commit into from
Aug 26, 2023
Merged

Fix formatting #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions rustfmt.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Basic
hard_tabs = true
max_width = 100
use_small_heuristics = "Max"
# Imports
imports_granularity = "Crate"
reorder_imports = true
# Consistency
newline_style = "Unix"
# Misc
chain_width = 80
spaces_around_ranges = false
binop_separator = "Back"
reorder_impl_items = false
match_arm_leading_pipes = "Preserve"
match_arm_blocks = false
match_block_trailing_comma = true
trailing_comma = "Vertical"
trailing_semicolon = false
use_field_init_shorthand = true
ignore = [
"bridges",
]
edition = "2021"
# Format comments
comment_width = 100
wrap_comments = true
15 changes: 9 additions & 6 deletions xcm-executor/src/assets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,12 +338,13 @@ impl Assets {
}
},
MultiAssetFilter::Wild(AllOfCounted { fun: WildFungible, id, .. }) |
MultiAssetFilter::Wild(AllOf { fun: WildFungible, id }) =>
MultiAssetFilter::Wild(AllOf { fun: WildFungible, id }) => {
if maybe_limit.map_or(true, |l| l >= 1) {
if let Some((id, amount)) = self.fungible.remove_entry(&id) {
taken.fungible.insert(id, amount);
}
},
}
},
MultiAssetFilter::Wild(AllOfCounted { fun: WildNonFungible, id, .. }) |
MultiAssetFilter::Wild(AllOf { fun: WildNonFungible, id }) => {
let non_fungible = mem::replace(&mut self.non_fungible, Default::default());
Expand Down Expand Up @@ -482,20 +483,22 @@ impl Assets {
}
},
MultiAssetFilter::Wild(AllOfCounted { fun: WildFungible, id, .. }) |
MultiAssetFilter::Wild(AllOf { fun: WildFungible, id }) =>
MultiAssetFilter::Wild(AllOf { fun: WildFungible, id }) => {
if let Some(&amount) = self.fungible.get(&id) {
masked.fungible.insert(*id, amount);
},
}
},
MultiAssetFilter::Wild(AllOfCounted { fun: WildNonFungible, id, .. }) |
MultiAssetFilter::Wild(AllOf { fun: WildNonFungible, id }) =>
MultiAssetFilter::Wild(AllOf { fun: WildNonFungible, id }) => {
for (c, instance) in self.non_fungible.iter() {
if c == id {
masked.non_fungible.insert((*c, *instance));
if maybe_limit.map_or(false, |l| masked.len() >= l) {
return masked
}
}
},
}
},
MultiAssetFilter::Definite(assets) =>
for asset in assets.inner().iter() {
match asset {
Expand Down