From 8009c6a8a5f62733881a65187c89072fa9a183fc Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Mon, 10 Dec 2018 21:27:44 -0600 Subject: [PATCH] MAINT: Formatting cleanup. --- src/ast/mod.rs | 8 +++-- src/build/mod.rs | 25 +++++++-------- src/convert/exec.rs | 9 ++++-- src/convert/flags.rs | 34 +++++++++++---------- src/convert/json.rs | 3 +- src/convert/toml.rs | 3 +- src/parse/mod.rs | 73 ++++++++++++++++++++++---------------------- 7 files changed, 81 insertions(+), 74 deletions(-) diff --git a/src/ast/mod.rs b/src/ast/mod.rs index f01ec85..04fd0d3 100644 --- a/src/ast/mod.rs +++ b/src/ast/mod.rs @@ -605,9 +605,11 @@ impl MacroDef { stack.push(expr); } } - &Expression::Call(ref def) => for expr in def.arglist.iter() { - stack.push(expr); - }, + &Expression::Call(ref def) => { + for expr in def.arglist.iter() { + stack.push(expr); + } + } &Expression::Simple(ref val) => { let mut syms_set = self.validate_value_symbols(&mut stack, val); bad_symbols.extend(syms_set.drain()); diff --git a/src/build/mod.rs b/src/build/mod.rs index f98ddf4..ecbe9a0 100644 --- a/src/build/mod.rs +++ b/src/build/mod.rs @@ -302,7 +302,8 @@ impl Builder { "Error building file: {}\n{}", self.file.to_string_lossy(), e.as_ref() - ).as_ref(), + ) + .as_ref(), ); Err(Box::new(err)) } @@ -578,12 +579,7 @@ impl Builder { continue; } &Val::List(ref elems) => { - self.lookup_in_list( - &mut stack, - sl, - (&next.pos, &next.fragment), - elems - )?; + self.lookup_in_list(&mut stack, sl, (&next.pos, &next.fragment), elems)?; continue; } _ => { @@ -737,7 +733,9 @@ impl Builder { left: Rc, right: Rc, ) -> Result, Box> { - Ok(Rc::new(Val::Boolean(left.equal(right.as_ref(), pos.clone())?))) + Ok(Rc::new(Val::Boolean( + left.equal(right.as_ref(), pos.clone())?, + ))) } fn do_not_deep_equal( @@ -746,7 +744,9 @@ impl Builder { left: Rc, right: Rc, ) -> Result, Box> { - Ok(Rc::new(Val::Boolean(!left.equal(right.as_ref(), pos.clone())?))) + Ok(Rc::new(Val::Boolean( + !left.equal(right.as_ref(), pos.clone())?, + ))) } fn do_gt(&self, pos: &Position, left: Rc, right: Rc) -> Result, Box> { @@ -981,7 +981,8 @@ impl Builder { let first = a.0.clone(); let t = a.1.clone(); (first, t.1) - }).collect(), + }) + .collect(), ))); } @@ -1073,7 +1074,7 @@ impl Builder { self.file.clone(), self.assets.clone(), self.env.clone(), - argvals + argvals, )?; return Ok(Rc::new(Val::Tuple(fields))); } @@ -1184,7 +1185,7 @@ impl Builder { self.file.clone(), self.assets.clone(), self.env.clone(), - argvals + argvals, )?; if let Some(v) = Self::find_in_fieldlist(&def.field, &fields) { match def.typ { diff --git a/src/convert/exec.rs b/src/convert/exec.rs index bc7ade2..484ab01 100644 --- a/src/convert/exec.rs +++ b/src/convert/exec.rs @@ -212,7 +212,8 @@ mod exec_test { "let script = { command = \"/bin/echo\", };", - ).unwrap(); + ) + .unwrap(); let result = b.get_out_by_name("script").unwrap(); let mut expected = "#!/usr/bin/env bash\n".to_string(); expected.push_str("# Turn on unofficial Bash-Strict-Mode\n"); @@ -236,7 +237,8 @@ mod exec_test { quux = \"baz\", }, };", - ).unwrap(); + ) + .unwrap(); let result = b.get_out_by_name("script").unwrap(); let mut expected = "#!/usr/bin/env bash\n".to_string(); expected.push_str("# Turn on unofficial Bash-Strict-Mode\n"); @@ -267,7 +269,8 @@ mod exec_test { {flag1 = 1}, ], };", - ).unwrap(); + ) + .unwrap(); let result = b.get_out_by_name("script").unwrap(); let mut expected = "#!/usr/bin/env bash\n".to_string(); expected.push_str("# Turn on unofficial Bash-Strict-Mode\n"); diff --git a/src/convert/flags.rs b/src/convert/flags.rs index 94bc4f5..c7544b1 100644 --- a/src/convert/flags.rs +++ b/src/convert/flags.rs @@ -75,25 +75,27 @@ impl FlagConverter { &Val::List(ref _def) => { eprintln!("Skipping List..."); } - &Val::Tuple(ref flds) => for &(ref name, ref val) in flds.iter() { - if let &Val::Empty = val.as_ref() { - self.write_flag_name(pfx, &name.val, w)?; - continue; - } - match val.as_ref() { - &Val::Tuple(_) => { - let new_pfx = format!("{}{}.", pfx, name); - self.write(&new_pfx, val, w)?; - } - &Val::List(ref def) => { - self.write_list_flag(pfx, &name.val, def, w)?; - } - _ => { + &Val::Tuple(ref flds) => { + for &(ref name, ref val) in flds.iter() { + if let &Val::Empty = val.as_ref() { self.write_flag_name(pfx, &name.val, w)?; - self.write(pfx, &val, w)?; + continue; + } + match val.as_ref() { + &Val::Tuple(_) => { + let new_pfx = format!("{}{}.", pfx, name); + self.write(&new_pfx, val, w)?; + } + &Val::List(ref def) => { + self.write_list_flag(pfx, &name.val, def, w)?; + } + _ => { + self.write_flag_name(pfx, &name.val, w)?; + self.write(pfx, &val, w)?; + } } } - }, + } &Val::Macro(ref _def) => { // This is ignored eprintln!("Skipping macro..."); diff --git a/src/convert/json.rs b/src/convert/json.rs index 0ebf69b..602c5e6 100644 --- a/src/convert/json.rs +++ b/src/convert/json.rs @@ -40,8 +40,7 @@ impl JsonConverter { ) -> std::io::Result { let mut mp = serde_json::Map::new(); for &(ref k, ref v) in items.iter() { - mp.entry(k.val.clone()) - .or_insert(self.convert_value(v)?); + mp.entry(k.val.clone()).or_insert(self.convert_value(v)?); } Ok(serde_json::Value::Object(mp)) } diff --git a/src/convert/toml.rs b/src/convert/toml.rs index 261deba..4b4bac7 100644 --- a/src/convert/toml.rs +++ b/src/convert/toml.rs @@ -44,8 +44,7 @@ impl TomlConverter { fn convert_tuple(&self, items: &Vec<(ast::PositionedItem, Rc)>) -> ConvertResult { let mut mp = toml::value::Table::new(); for &(ref k, ref v) in items.iter() { - mp.entry(k.val.clone()) - .or_insert(self.convert_value(v)?); + mp.entry(k.val.clone()).or_insert(self.convert_value(v)?); } Ok(toml::Value::Table(mp)) } diff --git a/src/parse/mod.rs b/src/parse/mod.rs index 338cb78..53cea34 100644 --- a/src/parse/mod.rs +++ b/src/parse/mod.rs @@ -243,35 +243,35 @@ macro_rules! alt_peek { // inputs. So handle with care. fn number(input: SliceIter) -> Result, Value> { let parsed = do_each!(input, - num => either!( - complete!( - "Not a float", - do_each!( // 1.0 - prefix => match_type!(DIGIT), - has_dot => punct!("."), - suffix => match_type!(DIGIT), - (Some(prefix.clone()), Some(has_dot.clone()), Some(suffix.clone())) - )), - complete!( - "Not a float", - do_each!( // 1. - prefix => match_type!(DIGIT), - has_dot => punct!("."), - (Some(prefix.clone()), Some(has_dot.clone()), None) - )), - complete!( - "Not a float", - do_each!( // .1 - has_dot => punct!("."), - suffix => match_type!(DIGIT), - (None, Some(has_dot.clone()), Some(suffix.clone())) - )), - do_each!( // 1 - prefix => match_type!(DIGIT), - (Some(prefix.clone()), None, None) - )), - (num) - ); + num => either!( + complete!( + "Not a float", + do_each!( // 1.0 + prefix => match_type!(DIGIT), + has_dot => punct!("."), + suffix => match_type!(DIGIT), + (Some(prefix.clone()), Some(has_dot.clone()), Some(suffix.clone())) + )), + complete!( + "Not a float", + do_each!( // 1. + prefix => match_type!(DIGIT), + has_dot => punct!("."), + (Some(prefix.clone()), Some(has_dot.clone()), None) + )), + complete!( + "Not a float", + do_each!( // .1 + has_dot => punct!("."), + suffix => match_type!(DIGIT), + (None, Some(has_dot.clone()), Some(suffix.clone())) + )), + do_each!( // 1 + prefix => match_type!(DIGIT), + (Some(prefix.clone()), None, None) + )), + (num) + ); match parsed { Result::Abort(e) => Result::Abort(e), Result::Fail(e) => Result::Fail(e), @@ -538,7 +538,8 @@ fn tuple_to_macro<'a>( .map(|s| PositionedItem { pos: s.pos().clone(), val: s.to_string(), - }).collect(); + }) + .collect(); match val { Value::Tuple(v) => Ok(Expression::Macro(MacroDef { argdefs: arglist, @@ -945,12 +946,12 @@ make_fn!( //trace_macros!(true); fn statement(i: SliceIter) -> Result, Statement> { return alt_peek!(i, - word!("assert") => trace_nom!(assert_statement) | - word!("import") => trace_nom!(import_statement) | - word!("let") => trace_nom!(let_statement) | - word!("out") => trace_nom!(out_statement) | - trace_nom!(expression_statement) - ); + word!("assert") => trace_nom!(assert_statement) | + word!("import") => trace_nom!(import_statement) | + word!("let") => trace_nom!(let_statement) | + word!("out") => trace_nom!(out_statement) | + trace_nom!(expression_statement) + ); } //trace_macros!(false);