mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

preserve order if blocks are between items

Browse Source
This commit is contained in:
QuietMisdreavus 2018-08-02 16:24:20 -05:00
parent d6a7a3cab0
commit 7e77d19905
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/librustc_driver/pretty.rs
View File

@ -798,17 +798,17 @@ fn block_to_stmt(b: ast::Block, sess: &Session) -> ast::Stmt {
fold::noop_fold_block(b, self)
} else {
b.map(|b| {
let old_blocks = self.nested_blocks.replace(vec![]);
let mut stmts = vec![];
for s in b.stmts {
let old_blocks = self.nested_blocks.replace(vec![]);
let mut stmts = b.stmts.into_iter()
.flat_map(|s| self.fold_stmt(s))
.filter(|s| s.is_item())
.collect::<Vec<ast::Stmt>>();
stmts.extend(self.fold_stmt(s).into_iter().filter(|s| s.is_item()));
// we put a Some in there earlier with that replace(), so this is valid
let new_blocks = self.nested_blocks.take().unwrap();
self.nested_blocks = old_blocks;
stmts.extend(new_blocks.into_iter().map(|b| block_to_stmt(b, &self.sess)));
// we put a Some in there earlier with that replace(), so this is valid
let new_blocks = self.nested_blocks.take().unwrap();
self.nested_blocks = old_blocks;
stmts.extend(new_blocks.into_iter().map(|b| block_to_stmt(b, &self.sess)));
}
let mut new_block = ast::Block {
stmts,