Merge pull request #1843 from RustPython/coolreader18/clippy-fixes

Fix some clippy lints that were previously 'allow'ed
This commit is contained in:
Jeong YunWon 2020-04-27 00:10:01 +09:00 committed by GitHub
commit 3f2b414fcc

View file

@ -739,7 +739,6 @@ impl SymbolTableBuilder {
Ok(()) Ok(())
} }
#[allow(clippy::single_match)]
fn register_name(&mut self, name: &str, role: SymbolUsage) -> SymbolTableResult { fn register_name(&mut self, name: &str, role: SymbolUsage) -> SymbolTableResult {
let scope_depth = self.tables.len(); let scope_depth = self.tables.len();
let table = self.tables.last_mut().unwrap(); let table = self.tables.last_mut().unwrap();
@ -775,13 +774,11 @@ impl SymbolTableBuilder {
// Some more checks: // Some more checks:
match role { match role {
SymbolUsage::Nonlocal => { SymbolUsage::Nonlocal if scope_depth < 2 => {
if scope_depth < 2 { return Err(SymbolTableError {
return Err(SymbolTableError { error: format!("cannot define nonlocal '{}' at top level.", name),
error: format!("cannot define nonlocal '{}' at top level.", name), location,
location, })
});
}
} }
_ => { _ => {
// Ok! // Ok!