1
Fork 0

Fix tidy issues

This commit is contained in:
Oliver Schneider 2017-05-10 13:58:41 +02:00
parent e2f781c7ea
commit 9d51d6bc30
2 changed files with 15 additions and 5 deletions

View file

@ -424,8 +424,10 @@ impl<'a> Resolver<'a> {
fn build_reduced_graph_for_block(&mut self, block: &Block) { fn build_reduced_graph_for_block(&mut self, block: &Block) {
let parent = self.current_module; let parent = self.current_module;
if self.block_needs_anonymous_module(block) { if self.block_needs_anonymous_module(block) {
let module = let module = self.new_module(parent,
self.new_module(parent, ModuleKind::Block(block.id), parent.normal_ancestor_id, block.span); ModuleKind::Block(block.id),
parent.normal_ancestor_id,
block.span);
self.block_map.insert(block.id, module); self.block_map.insert(block.id, module);
self.current_module = module; // Descend into the block. self.current_module = module; // Descend into the block.
} }

View file

@ -873,7 +873,10 @@ pub struct ModuleData<'a> {
pub type Module<'a> = &'a ModuleData<'a>; pub type Module<'a> = &'a ModuleData<'a>;
impl<'a> ModuleData<'a> { impl<'a> ModuleData<'a> {
fn new(parent: Option<Module<'a>>, kind: ModuleKind, normal_ancestor_id: DefId, span: Span) -> Self { fn new(parent: Option<Module<'a>>,
kind: ModuleKind,
normal_ancestor_id: DefId,
span: Span) -> Self {
ModuleData { ModuleData {
parent: parent, parent: parent,
kind: kind, kind: kind,
@ -1434,8 +1437,13 @@ impl<'a> Resolver<'a> {
self.crate_loader.postprocess(krate); self.crate_loader.postprocess(krate);
} }
fn new_module(&self, parent: Module<'a>, kind: ModuleKind, normal_ancestor_id: DefId, span: Span) fn new_module(
-> Module<'a> { &self,
parent: Module<'a>,
kind: ModuleKind,
normal_ancestor_id: DefId,
span: Span,
) -> Module<'a> {
self.arenas.alloc_module(ModuleData::new(Some(parent), kind, normal_ancestor_id, span)) self.arenas.alloc_module(ModuleData::new(Some(parent), kind, normal_ancestor_id, span))
} }