dranke/curlywas
1
0
Fork 0
mirror of https://github.com/exoticorn/curlywas.git synced 2026-01-21 04:06:42 +01:00
Code Issues Projects Releases Wiki Activity

clippy fixes

Browse Source
This commit is contained in:
Dennis Ranke
2022-02-22 22:40:45 +01:00
parent ce8435e3dc
commit 1b434f6b30
6 changed files with 34 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/typecheck.rs
View File

@@ -160,7 +160,7 @@ pub fn tc_script(script: &mut ast::Script, source: &str) -> Result<()> {
context.locals.locals[index].index = Some((locals_start + id) as u32);
}
f.locals = std::mem::replace(&mut context.locals, ast::Locals::default());
f.locals = std::mem::take(&mut context.locals);
if f.body.type_ != f.type_ {
result = type_mismatch(f.type_, &f.span, f.body.type_, &f.body.span, source);
@@ -333,7 +333,7 @@ fn type_mismatch(
"Expected type {:?}...",
type1
.map(|t| format!("{:?}", t))
.unwrap_or("void".to_string())
.unwrap_or_else(|| "void".to_string())
))
.with_color(Color::Yellow),
)
@@ -343,7 +343,7 @@ fn type_mismatch(
"...but found type {}",
type2
.map(|t| format!("{:?}", t))
.unwrap_or("void".to_string())
.unwrap_or_else(|| "void".to_string())
))
.with_color(Color::Red),
)
@@ -406,7 +406,7 @@ fn missing_label(span: &Span, source: &str) -> Result<()> {
.finish()
.eprint(Source::from(source))
.unwrap();
return Err(());
Err(())
}
fn tc_expression(context: &mut Context, expr: &mut ast::Expression) -> Result<()> {