From cb17ac6e5da5f9a4d3557ea055be89813cc17fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Mur=20Er=C5=BEen?= Date: Thu, 18 Jan 2024 01:13:13 +0100 Subject: [PATCH] clippy --- prqlc/prqlc/src/semantic/resolver/expr.rs | 14 +++++++------- prqlc/prqlc/tests/integration/cli.rs | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/prqlc/prqlc/src/semantic/resolver/expr.rs b/prqlc/prqlc/src/semantic/resolver/expr.rs index a3f9e31e869f..dc2b6eaa2bcb 100644 --- a/prqlc/prqlc/src/semantic/resolver/expr.rs +++ b/prqlc/prqlc/src/semantic/resolver/expr.rs @@ -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, id: usize, - alias: Box>, - span: Box>, + alias: Option, + span: Option, ) -> Result { - 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)?; diff --git a/prqlc/prqlc/tests/integration/cli.rs b/prqlc/prqlc/tests/integration/cli.rs index 84abb7b11eee..eb9f021fb7d4 100644 --- a/prqlc/prqlc/tests/integration/cli.rs +++ b/prqlc/prqlc/tests/integration/cli.rs @@ -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()