diff options
Diffstat (limited to 'crates/driver')
-rw-r--r-- | crates/driver/src/args.rs | 4 | ||||
-rw-r--r-- | crates/driver/src/context.rs | 2 | ||||
-rw-r--r-- | crates/driver/src/recipe.rs | 2 | ||||
-rw-r--r-- | crates/driver/src/resolve.rs | 3 | ||||
-rw-r--r-- | crates/driver/src/template.rs | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/crates/driver/src/args.rs b/crates/driver/src/args.rs index 510a156..805646a 100644 --- a/crates/driver/src/args.rs +++ b/crates/driver/src/args.rs @@ -100,7 +100,7 @@ impl<'a> IntoIterator for &'a TaskArgs { } } -#[allow(clippy::derive_hash_xor_eq)] +#[allow(clippy::derived_hash_with_manual_eq)] impl hash::Hash for TaskArgs { fn hash<H: hash::Hasher>(&self, _state: &mut H) { // Don't do anything: Properly hashing the task args is likely to cost @@ -116,7 +116,7 @@ pub fn arg<A: Into<Arg>>(key: &str, value: A) -> (String, Arg) { #[derive(Clone, Debug, Deserialize, Default, PartialEq, Eq)] pub struct ArgMapping(pub HashMap<String, String>); -#[allow(clippy::derive_hash_xor_eq)] +#[allow(clippy::derived_hash_with_manual_eq)] impl hash::Hash for ArgMapping { fn hash<H: hash::Hasher>(&self, _state: &mut H) {} } diff --git a/crates/driver/src/context.rs b/crates/driver/src/context.rs index 70c4556..9674e5f 100644 --- a/crates/driver/src/context.rs +++ b/crates/driver/src/context.rs @@ -354,7 +354,7 @@ impl Context { }) } - pub fn parse<'ctx>(&'ctx self, s: &str) -> error::Result<(TaskRef, TaskFlags)> { + pub fn parse(&self, s: &str) -> error::Result<(TaskRef, TaskFlags)> { let (parsed, flags) = parse::parse_task_with_flags(s).context("Invalid task syntax")?; let recipe = parsed.recipe.to_string(); diff --git a/crates/driver/src/recipe.rs b/crates/driver/src/recipe.rs index c6a06f1..474096b 100644 --- a/crates/driver/src/recipe.rs +++ b/crates/driver/src/recipe.rs @@ -68,7 +68,7 @@ pub fn read_recipes<P: AsRef<Path>>(path: P) -> Result<HashMap<TaskID, Vec<TaskD Some(Some(v)) => v, _ => continue, }; - let (basename, version) = match stem.split_once("@") { + let (basename, version) = match stem.split_once('@') { Some((basename, version)) => (basename, Some(version)), None => (stem, None), }; diff --git a/crates/driver/src/resolve.rs b/crates/driver/src/resolve.rs index 35915c0..d03f26d 100644 --- a/crates/driver/src/resolve.rs +++ b/crates/driver/src/resolve.rs @@ -190,8 +190,7 @@ pub fn get_dependent_outputs<'ctx>( .into_iter() .chain( ctx.get_host_depends(task_ref) - .map_err(|err| vec![err.into()])? - .into_iter(), + .map_err(|err| vec![err.into()])?, ) .collect(); runtime_depends(ctx, deps) diff --git a/crates/driver/src/template.rs b/crates/driver/src/template.rs index b663e7d..7bb089c 100644 --- a/crates/driver/src/template.rs +++ b/crates/driver/src/template.rs @@ -6,7 +6,7 @@ use common::error::*; use crate::args::TaskArgs; fn escape(s: &str) -> String { - format!("'{}'", s.replace("'", "'\\''")) + format!("'{}'", s.replace('\'', "'\\''")) } #[derive(Debug)] |