OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rustc: Make std_inject valid for pretty-printer

Browse Source 
Inject `extern crate {std, native}` before `use` statements.
Add `#![feature(glob)]` since `use std::prelude::*` is used.

(Unfortunately `rustc --pretty expanded` does not converge,
since `extern crate` and `use std::prelude::*` is injected at every
iteration.)
This commit is contained in:
klutzy 2014-04-16 14:32:35 +09:00 committed by Alex Crichton
parent 0004953c3a
commit 6d535b5b8d
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/librustc/front/std_inject.rs
View File

@ -100,6 +100,7 @@ impl<'a> fold::Folder for StandardLibraryInjector<'a> {
});
}
// `extern crate` must be precede `use` items
vis.push_all_move(krate.module.view_items.clone());
let new_module = ast::Mod {
view_items: vis,
@ -130,8 +131,20 @@ impl<'a> fold::Folder for PreludeInjector<'a> {
if !no_prelude(krate.attrs.as_slice()) {
// only add `use std::prelude::*;` if there wasn't a
// `#![no_implicit_prelude]` at the crate level.
let mut attrs = krate.attrs.clone();
// fold_mod() will insert glob path.
let globs_attr = attr::mk_attr(attr::mk_list_item(
InternedString::new("feature"),
vec!(
attr::mk_word_item(InternedString::new("globs")),
)));
attrs.push(globs_attr);
ast::Crate {
module: self.fold_mod(&krate.module),
attrs: attrs,
..krate
}
} else {
@ -175,11 +188,20 @@ impl<'a> fold::Folder for PreludeInjector<'a> {
span: DUMMY_SP,
};
let vis = (vec!(vi2)).append(module.view_items.as_slice());
let (crates, uses) = module.view_items.partitioned(|x| {
match x.node {
ast::ViewItemExternCrate(..) => true,
_ => false,
}
});
// add vi2 after any `extern crate` but before any `use`
let mut view_items = crates;
view_items.push(vi2);
view_items.push_all_move(uses);
// FIXME #2543: Bad copy.
let new_module = ast::Mod {
view_items: vis,
view_items: view_items,
..(*module).clone()
};
fold::noop_fold_mod(&new_module, self)