extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-18 18:28:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apply more recent/nightly clippy lints (#7916)

Browse Source 
# Description

- Use inline format strings in dataframe code
- Fix manual `.is_ascii_digit()` check
- Remove unnecessary `.into_iter()` calls
This commit is contained in:
Stefan Holderbach
2023-01-30 14:06:36 +01:00
committed by GitHub
parent 7402589775
commit 1ea39abcff
20 changed files with 56 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/nu-command/src/dataframe/eager/open.rs
View File

@@ -119,10 +119,7 @@ fn command(
"ipc" | "arrow" => from_ipc(engine_state, stack, call),
"json" => from_json(engine_state, stack, call),
_ => Err(ShellError::FileNotFoundCustom(
format!(
"{}. Supported values: csv, tsv, parquet, ipc, arrow, json",
msg
),
format!("{msg}. Supported values: csv, tsv, parquet, ipc, arrow, json"),
blamed,
)),
},
@@ -154,7 +151,7 @@ fn from_parquet(
.map_err(|e| {
ShellError::GenericError(
"Parquet reader error".into(),
format!("{:?}", e),
format!("{e:?}"),
Some(call.head),
None,
Vec::new(),
@@ -188,7 +185,7 @@ fn from_parquet(
.map_err(|e| {
ShellError::GenericError(
"Parquet reader error".into(),
format!("{:?}", e),
format!("{e:?}"),
Some(call.head),
None,
Vec::new(),
@@ -219,7 +216,7 @@ fn from_ipc(
.map_err(|e| {
ShellError::GenericError(
"IPC reader error".into(),
format!("{:?}", e),
format!("{e:?}"),
Some(call.head),
None,
Vec::new(),
@@ -253,7 +250,7 @@ fn from_ipc(
.map_err(|e| {
ShellError::GenericError(
"IPC reader error".into(),
format!("{:?}", e),
format!("{e:?}"),
Some(call.head),
None,
Vec::new(),
@@ -289,7 +286,7 @@ fn from_json(
.map_err(|e| {
ShellError::GenericError(
"Json reader error".into(),
format!("{:?}", e),
format!("{e:?}"),
Some(call.head),
None,
Vec::new(),
@@ -353,7 +350,7 @@ fn from_csv(
.map_err(|e| {
ShellError::GenericError(
"Parquet reader error".into(),
format!("{:?}", e),
format!("{e:?}"),
Some(call.head),
None,
Vec::new(),
@@ -419,7 +416,7 @@ fn from_csv(
.map_err(|e| {
ShellError::GenericError(
"Parquet reader error".into(),
format!("{:?}", e),
format!("{e:?}"),
Some(call.head),
None,
Vec::new(),

12
crates/nu-command/src/dataframe/eager/sql_context.rs
View File

@@ -77,12 +77,12 @@ impl SQLContext {
Ok(match select_item {
SelectItem::UnnamedExpr(expr) => {
let expr = parse_sql_expr(expr)?;
raw_projection_before_alias.insert(format!("{:?}", expr), i);
raw_projection_before_alias.insert(format!("{expr:?}"), i);
expr
}
SelectItem::ExprWithAlias { expr, alias } => {
let expr = parse_sql_expr(expr)?;
raw_projection_before_alias.insert(format!("{:?}", expr), i);
raw_projection_before_alias.insert(format!("{expr:?}"), i);
expr.alias(&alias.value)
}
SelectItem::QualifiedWildcard(_, _) | SelectItem::Wildcard(_) => {
@@ -133,7 +133,7 @@ impl SQLContext {
// and its projections columns, keeping the original index
let (exclude_expr, groupby_pos): (Vec<_>, Vec<_>) = group_by
.iter()
.map(|expr| raw_projection_before_alias.get(&format!("{:?}", expr)))
.map(|expr| raw_projection_before_alias.get(&format!("{expr:?}")))
.enumerate()
.filter(|(_, proj_p)| proj_p.is_some())
.map(|(gb_p, proj_p)| (*proj_p.unwrap_or(&0), (*proj_p.unwrap_or(&0), gb_p)))
@@ -173,7 +173,7 @@ impl SQLContext {
pub fn execute(&self, query: &str) -> Result<LazyFrame, PolarsError> {
let ast = Parser::parse_sql(&self.dialect, query)
.map_err(|e| PolarsError::ComputeError(format!("{:?}", e).into()))?;
.map_err(|e| PolarsError::ComputeError(format!("{e:?}").into()))?;
if ast.len() != 1 {
Err(PolarsError::ComputeError(
"One and only one statement at a time please".into(),
@@ -196,7 +196,7 @@ impl SQLContext {
Some(SqlExpr::Value(SQLValue::Number(nrow, _))) => {
let nrow = nrow.parse().map_err(|err| {
PolarsError::ComputeError(
format!("Conversion Error: {:?}", err).into(),
format!("Conversion Error: {err:?}").into(),
)
})?;
rs.limit(nrow)
@@ -211,7 +211,7 @@ impl SQLContext {
}
_ => {
return Err(PolarsError::ComputeError(
format!("Statement type {:?} is not supported", ast).into(),
format!("Statement type {ast:?} is not supported").into(),
))
}
})

27
crates/nu-command/src/dataframe/eager/sql_expr.rs
View File

@@ -41,11 +41,7 @@ fn map_sql_polars_datatype(data_type: &SQLDataType) -> Result<DataType> {
},
_ => {
return Err(PolarsError::ComputeError(
format!(
"SQL Datatype {:?} was not supported in polars-sql yet!",
data_type
)
.into(),
format!("SQL Datatype {data_type:?} was not supported in polars-sql yet!").into(),
))
}
})
@@ -75,7 +71,7 @@ fn binary_op_(left: Expr, right: Expr, op: &SQLBinaryOperator) -> Result<Expr> {
SQLBinaryOperator::Xor => left.xor(right),
_ => {
return Err(PolarsError::ComputeError(
format!("SQL Operator {:?} was not supported in polars-sql yet!", op).into(),
format!("SQL Operator {op:?} was not supported in polars-sql yet!").into(),
))
}
})
@@ -87,11 +83,11 @@ fn literal_expr(value: &SqlValue) -> Result<Expr> {
// Check for existence of decimal separator dot
if s.contains('.') {
s.parse::<f64>().map(lit).map_err(|_| {
PolarsError::ComputeError(format!("Can't parse literal {:?}", s).into())
PolarsError::ComputeError(format!("Can't parse literal {s:?}").into())
})
} else {
s.parse::<i64>().map(lit).map_err(|_| {
PolarsError::ComputeError(format!("Can't parse literal {:?}", s).into())
PolarsError::ComputeError(format!("Can't parse literal {s:?}").into())
})
}?
}
@@ -103,11 +99,7 @@ fn literal_expr(value: &SqlValue) -> Result<Expr> {
SqlValue::Null => Expr::Literal(LiteralValue::Null),
_ => {
return Err(PolarsError::ComputeError(
format!(
"Parsing SQL Value {:?} was not supported in polars-sql yet!",
value
)
.into(),
format!("Parsing SQL Value {value:?} was not supported in polars-sql yet!").into(),
))
}
})
@@ -127,11 +119,7 @@ pub fn parse_sql_expr(expr: &SqlExpr) -> Result<Expr> {
SqlExpr::Value(value) => literal_expr(value)?,
_ => {
return Err(PolarsError::ComputeError(
format!(
"Expression: {:?} was not supported in polars-sql yet!",
expr
)
.into(),
format!("Expression: {expr:?} was not supported in polars-sql yet!").into(),
))
}
})
@@ -185,8 +173,7 @@ fn parse_sql_function(sql_function: &SQLFunction) -> Result<Expr> {
_ => {
return Err(PolarsError::ComputeError(
format!(
"Function {:?} with args {:?} was not supported in polars-sql yet!",
function_name, args
"Function {function_name:?} with args {args:?} was not supported in polars-sql yet!"
)
.into(),
))