guangzong/stm32-data
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #283 from xoviat/sort-ir

Browse Source 
metapac-gen: sort ir
This commit is contained in:
xoviat 2023-10-14 02:57:03 +00:00 committed by GitHub
commit 0df3b9cbb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
stm32-metapac-gen/src/data.rs
View File

@ -12,11 +12,11 @@ pub mod ir {
impl IR {
pub fn from_chiptool(ir: chiptool::ir::IR) -> Self {
let blocks: Vec<Block> = ir
let mut blocks: Vec<Block> = ir
.blocks
.iter()
.map(|(name, block)| {
let items = block
let mut items: Vec<_> = block
.items
.iter()
.map(|item| BlockItem {
@ -54,6 +54,8 @@ pub mod ir {
})
.collect();
items.sort_by_key(|i| i.name.clone());
Block {
name: name.to_string(),
items: items,
@ -62,7 +64,10 @@ pub mod ir {
}
})
.collect();
let fieldsets: Vec<FieldSet> = ir
blocks.sort_by_key(|b| b.name.clone());
let mut fieldsets: Vec<FieldSet> = ir
.fieldsets
.iter()
.map(|(name, fieldset)| {
@ -99,7 +104,10 @@ pub mod ir {
}
})
.collect();
let enums: Vec<Enum> = ir
fieldsets.sort_by_key(|f| f.name.clone());
let mut enums: Vec<Enum> = ir
.enums
.iter()
.map(|(name, enumm)| {
@ -122,6 +130,8 @@ pub mod ir {
})
.collect();
enums.sort_by_key(|e| e.name.clone());
Self {
blocks,
fieldsets,