forked from extern/nushell
Fix some nightly clippy warnings (#329)
This commit is contained in:
parent
db2bca56c9
commit
14a2918bba
7
Cargo.lock
generated
7
Cargo.lock
generated
@ -156,9 +156,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cc"
|
name = "cc"
|
||||||
version = "1.0.71"
|
version = "1.0.72"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd"
|
checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cfg-if"
|
name = "cfg-if"
|
||||||
@ -807,6 +807,7 @@ dependencies = [
|
|||||||
"nu-term-grid",
|
"nu-term-grid",
|
||||||
"rand",
|
"rand",
|
||||||
"rayon",
|
"rayon",
|
||||||
|
"regex",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_urlencoded",
|
"serde_urlencoded",
|
||||||
"serde_yaml",
|
"serde_yaml",
|
||||||
@ -1227,7 +1228,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "reedline"
|
name = "reedline"
|
||||||
version = "0.2.0"
|
version = "0.2.0"
|
||||||
source = "git+https://github.com/nushell/reedline?branch=main#1b244992981e392152b86ceed5c583c31150976c"
|
source = "git+https://github.com/nushell/reedline?branch=main#c11aef2d9b4eaf0c762f1349f641534597815295"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"crossterm 0.22.1",
|
"crossterm 0.22.1",
|
||||||
|
@ -98,11 +98,7 @@ pub fn sum(data: Vec<Value>, head: Span) -> Result<Value, ShellError> {
|
|||||||
| Value::Float { .. }
|
| Value::Float { .. }
|
||||||
| Value::Filesize { .. }
|
| Value::Filesize { .. }
|
||||||
| Value::Duration { .. } => {
|
| Value::Duration { .. } => {
|
||||||
let new_value = acc.add(head, value);
|
acc = acc.add(head, value)?;
|
||||||
if new_value.is_err() {
|
|
||||||
return new_value;
|
|
||||||
}
|
|
||||||
acc = new_value.expect("This should never trigger")
|
|
||||||
}
|
}
|
||||||
other => {
|
other => {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
@ -133,11 +129,7 @@ pub fn product(data: Vec<Value>, head: Span) -> Result<Value, ShellError> {
|
|||||||
for value in &data {
|
for value in &data {
|
||||||
match value {
|
match value {
|
||||||
Value::Int { .. } | Value::Float { .. } => {
|
Value::Int { .. } | Value::Float { .. } => {
|
||||||
let new_value = acc.mul(head, value);
|
acc = acc.mul(head, value)?;
|
||||||
if new_value.is_err() {
|
|
||||||
return new_value;
|
|
||||||
}
|
|
||||||
acc = new_value.expect("This should never trigger")
|
|
||||||
}
|
}
|
||||||
other => {
|
other => {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
|
@ -4,6 +4,7 @@ use std::collections::HashMap;
|
|||||||
|
|
||||||
const COMMANDS_DOCS_DIR: &str = "docs/commands";
|
const COMMANDS_DOCS_DIR: &str = "docs/commands";
|
||||||
|
|
||||||
|
#[derive(Default)]
|
||||||
pub struct DocumentationConfig {
|
pub struct DocumentationConfig {
|
||||||
no_subcommands: bool,
|
no_subcommands: bool,
|
||||||
//FIXME: add back in color support
|
//FIXME: add back in color support
|
||||||
@ -12,16 +13,6 @@ pub struct DocumentationConfig {
|
|||||||
brief: bool,
|
brief: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for DocumentationConfig {
|
|
||||||
fn default() -> Self {
|
|
||||||
DocumentationConfig {
|
|
||||||
no_subcommands: false,
|
|
||||||
no_color: false,
|
|
||||||
brief: false,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn generate_doc(name: &str, engine_state: &EngineState) -> (Vec<String>, Vec<Value>) {
|
fn generate_doc(name: &str, engine_state: &EngineState) -> (Vec<String>, Vec<Value>) {
|
||||||
let mut cols = vec![];
|
let mut cols = vec![];
|
||||||
let mut vals = vec![];
|
let mut vals = vec![];
|
||||||
|
@ -13,7 +13,7 @@ pub use lite_parse::{lite_parse, LiteBlock};
|
|||||||
pub use parse_keywords::{
|
pub use parse_keywords::{
|
||||||
parse_alias, parse_def, parse_def_predecl, parse_let, parse_module, parse_use,
|
parse_alias, parse_def, parse_def_predecl, parse_let, parse_module, parse_use,
|
||||||
};
|
};
|
||||||
pub use parser::{find_captures_in_expr, parse, Import, VarDecl};
|
pub use parser::{find_captures_in_expr, parse, Import};
|
||||||
|
|
||||||
#[cfg(feature = "plugin")]
|
#[cfg(feature = "plugin")]
|
||||||
pub use parse_keywords::parse_plugin;
|
pub use parse_keywords::parse_plugin;
|
||||||
|
@ -24,12 +24,6 @@ use crate::parse_keywords::parse_plugin;
|
|||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub enum Import {}
|
pub enum Import {}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct VarDecl {
|
|
||||||
var_id: VarId,
|
|
||||||
expression: Expression,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn garbage(span: Span) -> Expression {
|
pub fn garbage(span: Span) -> Expression {
|
||||||
Expression::garbage(span)
|
Expression::garbage(span)
|
||||||
}
|
}
|
||||||
@ -271,7 +265,7 @@ fn parse_short_flags(
|
|||||||
error = error.or_else(|| {
|
error = error.or_else(|| {
|
||||||
Some(ParseError::UnknownFlag(
|
Some(ParseError::UnknownFlag(
|
||||||
sig.name.clone(),
|
sig.name.clone(),
|
||||||
format!("-{}", String::from_utf8_lossy(contents).to_string()),
|
format!("-{}", String::from_utf8_lossy(contents)),
|
||||||
*first,
|
*first,
|
||||||
))
|
))
|
||||||
});
|
});
|
||||||
@ -281,7 +275,7 @@ fn parse_short_flags(
|
|||||||
error = error.or_else(|| {
|
error = error.or_else(|| {
|
||||||
Some(ParseError::UnknownFlag(
|
Some(ParseError::UnknownFlag(
|
||||||
sig.name.clone(),
|
sig.name.clone(),
|
||||||
format!("-{}", String::from_utf8_lossy(contents).to_string()),
|
format!("-{}", String::from_utf8_lossy(contents)),
|
||||||
*first,
|
*first,
|
||||||
))
|
))
|
||||||
});
|
});
|
||||||
@ -291,7 +285,7 @@ fn parse_short_flags(
|
|||||||
error = error.or_else(|| {
|
error = error.or_else(|| {
|
||||||
Some(ParseError::UnknownFlag(
|
Some(ParseError::UnknownFlag(
|
||||||
sig.name.clone(),
|
sig.name.clone(),
|
||||||
format!("-{}", String::from_utf8_lossy(contents).to_string()),
|
format!("-{}", String::from_utf8_lossy(contents)),
|
||||||
*first,
|
*first,
|
||||||
))
|
))
|
||||||
});
|
});
|
||||||
@ -302,7 +296,7 @@ fn parse_short_flags(
|
|||||||
error = error.or_else(|| {
|
error = error.or_else(|| {
|
||||||
Some(ParseError::UnknownFlag(
|
Some(ParseError::UnknownFlag(
|
||||||
sig.name.clone(),
|
sig.name.clone(),
|
||||||
format!("-{}", String::from_utf8_lossy(contents).to_string()),
|
format!("-{}", String::from_utf8_lossy(contents)),
|
||||||
*first,
|
*first,
|
||||||
))
|
))
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user