Skip to content

Commit

Permalink
clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
aljazerzen committed Jan 18, 2024
1 parent ad34f4e commit cb17ac6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
14 changes: 7 additions & 7 deletions prqlc/prqlc/src/semantic/resolver/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,23 +202,23 @@ impl PlFold for Resolver<'_> {
..node
},
};
self.finish_expr_resolve(Box::new(r), id, alias, span)
self.finish_expr_resolve(r, id, *alias, *span)
}
}

impl Resolver<'_> {
fn finish_expr_resolve(
&mut self,
expr: Box<Expr>,
expr: Expr,
id: usize,
alias: Box<Option<String>>,
span: Box<Option<Span>>,
alias: Option<String>,
span: Option<Span>,
) -> Result<Expr> {
let mut r = Box::new(self.static_eval(*expr)?);
let mut r = Box::new(self.static_eval(expr)?);

r.id = r.id.or(Some(id));
r.alias = r.alias.or(*alias);
r.span = r.span.or(*span);
r.alias = r.alias.or(alias);
r.span = r.span.or(span);

if r.ty.is_none() {
r.ty = Resolver::infer_type(&r)?;
Expand Down
1 change: 0 additions & 1 deletion prqlc/prqlc/tests/integration/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ fn compile_help() {
"###);
}

#[cfg(not(windows))] // This is back to causing a SO on Windows since https://github.com/PRQL/prql/pull/3786
#[test]
fn long_query() {
assert_cmd_snapshot!(prqlc_command()
Expand Down

0 comments on commit cb17ac6

Please sign in to comment.