Merge pull request #1114 from mkurnikov/fix-clippy-1.36

Enable clippy in CI
This commit is contained in:
Windel Bouwman 2019-07-07 15:28:43 +02:00 committed by GitHub
commit 5973ef9a41

View file

@ -301,19 +301,17 @@ impl SymbolTableBuilder {
if let Some(alias) = &part.alias { if let Some(alias) = &part.alias {
// `import mymodule as myalias` // `import mymodule as myalias`
self.register_name(alias, SymbolRole::Assigned)?; self.register_name(alias, SymbolRole::Assigned)?;
} else if part.symbols.is_empty() {
// `import module`
self.register_name(&part.module, SymbolRole::Assigned)?;
} else { } else {
if part.symbols.is_empty() { // `from mymodule import myimport`
// `import module` for symbol in &part.symbols {
self.register_name(&part.module, SymbolRole::Assigned)?; if let Some(alias) = &symbol.alias {
} else { // `from mymodule import myimportname as myalias`
// `from mymodule import myimport` self.register_name(alias, SymbolRole::Assigned)?;
for symbol in &part.symbols { } else {
if let Some(alias) = &symbol.alias { self.register_name(&symbol.symbol, SymbolRole::Assigned)?;
// `from mymodule import myimportname as myalias`
self.register_name(alias, SymbolRole::Assigned)?;
} else {
self.register_name(&symbol.symbol, SymbolRole::Assigned)?;
}
} }
} }
} }