Cargo Clippy !

main
trivernis 8 months ago
parent 3d1723dab4
commit 80bf296995
Signed by: Trivernis
GPG Key ID: 7E6D18B61C8D2F4B

@ -59,9 +59,7 @@ pub fn read_config(repo: &Path) -> Result<SiloConfig> {
lines.push(format!( lines.push(format!(
"config = utils.merge(config, utils.load_toml {old_config:?})" "config = utils.merge(config, utils.load_toml {old_config:?})"
)); ));
lines.push(format!( lines.push("config = utils.merge(config, config.template_context)".to_string())
"config = utils.merge(config, config.template_context)"
))
} }
lines.push("-- Changes can be added to the `config` object".to_owned()); lines.push("-- Changes can be added to the `config` object".to_owned());
lines.push("".to_owned()); lines.push("".to_owned());

@ -233,7 +233,7 @@ impl RootDirData {
} }
fn read_lua(path: &Path, cfg: &SiloConfig) -> Result<Self> { fn read_lua(path: &Path, cfg: &SiloConfig) -> Result<Self> {
let lua = create_lua(&cfg)?; let lua = create_lua(cfg)?;
let cfg: Self = lua let cfg: Self = lua
.from_value(lua.load(path).eval().describe("evaluating script")?) .from_value(lua.load(path).eval().describe("evaluating script")?)
.describe("deserialize lua value")?; .describe("deserialize lua value")?;

@ -108,7 +108,7 @@ impl Hooks {
impl HookScript { impl HookScript {
pub fn load(config: &SiloConfig, path: &Path) -> Result<Self> { pub fn load(config: &SiloConfig, path: &Path) -> Result<Self> {
let lua = create_lua(&config)?; let lua = create_lua(config)?;
let module: OwnedTable = lua let module: OwnedTable = lua
.load(path) .load(path)
.eval() .eval()

@ -52,7 +52,7 @@ fn lua_merge<'a>(lua: &'a Lua, (a, b): (mlua::Value, mlua::Value)) -> Result<mlu
} }
/// Parse a json string into a lua value /// Parse a json string into a lua value
fn lua_from_json<'a>(lua: &'a Lua, json_string: String) -> Result<mlua::Value<'a>> { fn lua_from_json(lua: &Lua, json_string: String) -> Result<mlua::Value<'_>> {
let toml_value: serde_json::Value = let toml_value: serde_json::Value =
serde_json::from_str(&json_string).map_err(mlua::Error::external)?; serde_json::from_str(&json_string).map_err(mlua::Error::external)?;
@ -60,31 +60,31 @@ fn lua_from_json<'a>(lua: &'a Lua, json_string: String) -> Result<mlua::Value<'a
} }
/// Reads a json file and parses it as a lua value /// Reads a json file and parses it as a lua value
fn lua_load_json<'a>(lua: &'a Lua, path: String) -> Result<mlua::Value<'a>> { fn lua_load_json(lua: &Lua, path: String) -> Result<mlua::Value<'_>> {
let contents = fs::read_to_string(path)?; let contents = fs::read_to_string(path)?;
lua_from_json(lua, contents) lua_from_json(lua, contents)
} }
/// Parse a toml string into a lua value /// Parse a toml string into a lua value
fn lua_from_toml<'a>(lua: &'a Lua, toml_string: String) -> Result<mlua::Value<'a>> { fn lua_from_toml(lua: &Lua, toml_string: String) -> Result<mlua::Value<'_>> {
let toml_value: toml::Value = toml::from_str(&toml_string).map_err(mlua::Error::external)?; let toml_value: toml::Value = toml::from_str(&toml_string).map_err(mlua::Error::external)?;
lua.to_value(&toml_value) lua.to_value(&toml_value)
} }
/// Reads a toml file and parses it as a lua value /// Reads a toml file and parses it as a lua value
fn lua_load_toml<'a>(lua: &'a Lua, path: String) -> Result<mlua::Value<'a>> { fn lua_load_toml(lua: &Lua, path: String) -> Result<mlua::Value<'_>> {
let contents = fs::read_to_string(path)?; let contents = fs::read_to_string(path)?;
lua_from_toml(lua, contents) lua_from_toml(lua, contents)
} }
/// Returns the path to the given command /// Returns the path to the given command
fn lua_which<'a>(_: &'a Lua, path: String) -> Result<Option<String>> { fn lua_which(_: &Lua, path: String) -> Result<Option<String>> {
Ok(which(path).ok().map(|p| p.to_string_lossy().into_owned())) Ok(which(path).ok().map(|p| p.to_string_lossy().into_owned()))
} }
/// Creates a new executable that can be called with a variable number of args /// Creates a new executable that can be called with a variable number of args
fn lua_ext<'a>(lua: &'a Lua, program: String) -> Result<Function<'a>> { fn lua_ext(lua: &Lua, program: String) -> Result<Function<'_>> {
lua.create_function(move |_lua, args| { lua.create_function(move |_lua, args| {
let exit_status = Command::new(&program) let exit_status = Command::new(&program)
.args::<Vec<String>, _>(args) .args::<Vec<String>, _>(args)
@ -110,7 +110,7 @@ struct CommandOutput {
} }
/// Creates a new executable that can be called with a variable number of args /// Creates a new executable that can be called with a variable number of args
fn lua_ext_piped<'a>(lua: &'a Lua, program: String) -> Result<Function<'a>> { fn lua_ext_piped(lua: &Lua, program: String) -> Result<Function<'_>> {
lua.create_function(move |lua, args| { lua.create_function(move |lua, args| {
let cmd = Command::new(&program) let cmd = Command::new(&program)
.args::<Vec<String>, _>(args) .args::<Vec<String>, _>(args)

Loading…
Cancel
Save