Skip to content

Commit 78db206

Browse files
epageepage
committed
chore: rustfmt
1 parent a936ba5 commit 78db206

18 files changed

Lines changed: 70 additions & 124 deletions

File tree

‎liquid-compiler/src/lexer.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,7 @@ mod test {
235235
);
236236
assert_eq!(
237237
split_atom("truc | filter:arg1,arg2"),
238-
vec![
239-
"truc", " ", "", "|", "", " ", "filter", ":", "arg1", ",", "arg2",
240-
]
238+
vec!["truc", " ", "", "|", "", " ", "filter", ":", "arg1", ",", "arg2",]
241239
);
242240
}
243241

‎liquid-interpreter/src/argument.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ impl Argument {
2020
pub fn evaluate(&self, context: &Context) -> Result<Value> {
2121
let val = match *self {
2222
Argument::Val(ref x) => x.clone(),
23-
Argument::Var(ref x) => context
24-
.stack()
25-
.get(x.path())?
26-
.clone(),
23+
Argument::Var(ref x) => context.stack().get(x.path())?.clone(),
2724
};
2825
Ok(val)
2926
}

‎liquid-interpreter/src/context.rs‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::collections::HashMap;
33
use std::sync;
44

55
use error::{Error, Result};
6-
use value::{Object, Value, Path};
6+
use value::{Object, Path, Value};
77

88
use super::Argument;
99
use super::Globals;
@@ -89,7 +89,7 @@ impl<'a, 'g> CycleState<'a, 'g> {
8989
return Err(Error::with_msg(
9090
"cycle index out of bounds, most likely from mismatched cycles",
9191
).context("index", format!("{}", index))
92-
.context("count", format!("{}", values.len())));
92+
.context("count", format!("{}", values.len())));
9393
}
9494

9595
let val = values[index].evaluate(self.context)?;
@@ -141,10 +141,7 @@ impl<'g> Stack<'g> {
141141
}
142142

143143
/// Recursively index into the stack.
144-
pub fn get(
145-
&self,
146-
path: &Path,
147-
) -> Result<&Value> {
144+
pub fn get(&self, path: &Path) -> Result<&Value> {
148145
let mut indexes = path.iter();
149146
let key = indexes
150147
.next()
@@ -350,8 +347,7 @@ mod test {
350347
#[test]
351348
fn stack_get_root() {
352349
let mut ctx = Context::new();
353-
ctx.stack_mut()
354-
.set_global("number", Value::scalar(42f64));
350+
ctx.stack_mut().set_global("number", Value::scalar(42f64));
355351
assert_eq!(
356352
ctx.stack().get_root("number").unwrap(),
357353
&Value::scalar(42f64)
@@ -373,11 +369,10 @@ mod test {
373369
let mut post = Object::new();
374370
post.insert("number".into(), Value::scalar(42f64));
375371
ctx.stack_mut().set_global("post", Value::Object(post));
376-
let indexes = vec![Index::with_key("post"), Index::with_key("number")].into_iter().collect();
377-
assert_eq!(
378-
ctx.stack().get(&indexes).unwrap(),
379-
&Value::scalar(42f64)
380-
);
372+
let indexes = vec![Index::with_key("post"), Index::with_key("number")]
373+
.into_iter()
374+
.collect();
375+
assert_eq!(ctx.stack().get(&indexes).unwrap(), &Value::scalar(42f64));
381376
}
382377

383378
#[test]
@@ -394,9 +389,7 @@ mod test {
394389
);
395390

396391
// set a new local value, and assert that it overrides the previous value
397-
new_scope
398-
.stack_mut()
399-
.set("test", Value::scalar(3.14f64));
392+
new_scope.stack_mut().set("test", Value::scalar(3.14f64));
400393
assert_eq!(
401394
new_scope.stack().get_root("test").unwrap(),
402395
&Value::scalar(3.14f64)

‎liquid-value/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ extern crate liquid_error;
1212
extern crate num_traits;
1313

1414
mod index;
15+
mod path;
1516
mod scalar;
1617
mod ser;
1718
mod values;
18-
mod path;
1919

2020
/// Liquid Processing Errors.
2121
pub mod error {

‎liquid-value/src/path.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub struct Path {
1414

1515
impl Path {
1616
/// Create a `Path` from iterator of `Index`s
17-
pub fn new<T: IntoIterator<Item=Index>>(indexes: T) -> Self {
17+
pub fn new<T: IntoIterator<Item = Index>>(indexes: T) -> Self {
1818
let indexes = indexes.into_iter().collect();
1919
Self { indexes }
2020
}

‎liquid-value/src/ser.rs‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,15 @@ impl serde::ser::Error for SerError {
4848
where
4949
T: fmt::Display,
5050
{
51-
SerError(error::Error::with_msg(format!("{}", msg)))
51+
SerError(error::Error::with_msg(format!("{}", msg)))
5252
}
5353
}
5454

5555
struct Serializer;
5656

5757
impl Serializer {
5858
#[inline]
59-
fn serialize_as_i32<T: num_traits::cast::NumCast>(
60-
self,
61-
value: T,
62-
) -> Result<Value, SerError> {
59+
fn serialize_as_i32<T: num_traits::cast::NumCast>(self, value: T) -> Result<Value, SerError> {
6360
let value = num_traits::cast::cast::<T, i32>(value)
6461
.ok_or_else(|| SerError(error::Error::with_msg("Cannot fit number")))?;
6562
Ok(Value::scalar(value))
@@ -593,11 +590,7 @@ impl serde::ser::SerializeStruct for SerializeMap {
593590
type Ok = Value;
594591
type Error = SerError;
595592

596-
fn serialize_field<T: ?Sized>(
597-
&mut self,
598-
key: &'static str,
599-
value: &T,
600-
) -> Result<(), SerError>
593+
fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<(), SerError>
601594
where
602595
T: Serialize,
603596
{
@@ -620,11 +613,7 @@ impl serde::ser::SerializeStructVariant for SerializeStructVariant {
620613
type Ok = Value;
621614
type Error = SerError;
622615

623-
fn serialize_field<T: ?Sized>(
624-
&mut self,
625-
key: &'static str,
626-
value: &T,
627-
) -> Result<(), SerError>
616+
fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<(), SerError>
628617
where
629618
T: Serialize,
630619
{

‎src/bin/liquid-dbg/main.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ fn run() -> Result<()> {
113113
.map(|s| {
114114
let p = path::PathBuf::from(s);
115115
build_context(p.as_path())
116-
})
117-
.map_or(Ok(None), |r| r.map(Some))?
116+
}).map_or(Ok(None), |r| r.map(Some))?
118117
.unwrap_or_else(liquid::value::Object::new);
119118
let output = template.render(&data)?;
120119
match matches.value_of("output") {

‎src/filters/math.rs‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ pub fn plus(input: &Value, args: &[Value]) -> FilterResult {
3535
input
3636
.to_float()
3737
.and_then(|i| operand.to_float().map(|o| Value::scalar(i + o)))
38-
})
39-
.ok_or_else(|| invalid_argument(0, "Number expected"))?;
38+
}).ok_or_else(|| invalid_argument(0, "Number expected"))?;
4039

4140
Ok(result)
4241
}
@@ -59,8 +58,7 @@ pub fn minus(input: &Value, args: &[Value]) -> FilterResult {
5958
input
6059
.to_float()
6160
.and_then(|i| operand.to_float().map(|o| Value::scalar(i - o)))
62-
})
63-
.ok_or_else(|| invalid_argument(0, "Number expected"))?;
61+
}).ok_or_else(|| invalid_argument(0, "Number expected"))?;
6462

6563
Ok(result)
6664
}
@@ -83,8 +81,7 @@ pub fn times(input: &Value, args: &[Value]) -> FilterResult {
8381
input
8482
.to_float()
8583
.and_then(|i| operand.to_float().map(|o| Value::scalar(i * o)))
86-
})
87-
.ok_or_else(|| invalid_argument(0, "Number expected"))?;
84+
}).ok_or_else(|| invalid_argument(0, "Number expected"))?;
8885

8986
Ok(result)
9087
}
@@ -107,8 +104,7 @@ pub fn divided_by(input: &Value, args: &[Value]) -> FilterResult {
107104
input
108105
.to_float()
109106
.and_then(|i| operand.to_float().map(|o| Value::scalar(i / o)))
110-
})
111-
.ok_or_else(|| invalid_argument(0, "Number expected"))?;
107+
}).ok_or_else(|| invalid_argument(0, "Number expected"))?;
112108

113109
Ok(result)
114110
}
@@ -131,8 +127,7 @@ pub fn modulo(input: &Value, args: &[Value]) -> FilterResult {
131127
input
132128
.to_float()
133129
.and_then(|i| operand.to_float().map(|o| Value::scalar(i % o)))
134-
})
135-
.ok_or_else(|| invalid_argument(0, "Number expected"))?;
130+
}).ok_or_else(|| invalid_argument(0, "Number expected"))?;
136131

137132
Ok(result)
138133
}

‎src/filters/mod.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,8 @@ pub fn truncate(input: &Value, args: &[Value]) -> FilterResult {
221221
.take(l)
222222
.collect::<Vec<&str>>()
223223
.join("")
224-
.to_string() + truncate_string.as_ref();
224+
.to_string()
225+
+ truncate_string.as_ref();
225226
Value::scalar(result)
226227
} else {
227228
input.clone()

‎src/parser.rs‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,20 @@ impl ParserBuilder {
6161
.filter(
6262
"capitalize",
6363
filters::capitalize as interpreter::FnFilterValue,
64-
)
65-
.filter("ceil", filters::ceil as interpreter::FnFilterValue)
64+
).filter("ceil", filters::ceil as interpreter::FnFilterValue)
6665
.filter("compact", filters::compact as interpreter::FnFilterValue)
6766
.filter("concat", filters::concat as interpreter::FnFilterValue)
6867
.filter("date", filters::date as interpreter::FnFilterValue)
6968
.filter("default", filters::default as interpreter::FnFilterValue)
7069
.filter(
7170
"divided_by",
7271
filters::divided_by as interpreter::FnFilterValue,
73-
)
74-
.filter("downcase", filters::downcase as interpreter::FnFilterValue)
72+
).filter("downcase", filters::downcase as interpreter::FnFilterValue)
7573
.filter("escape", filters::escape as interpreter::FnFilterValue)
7674
.filter(
7775
"escape_once",
7876
filters::escape_once as interpreter::FnFilterValue,
79-
)
80-
.filter("first", filters::first as interpreter::FnFilterValue)
77+
).filter("first", filters::first as interpreter::FnFilterValue)
8178
.filter("floor", filters::floor as interpreter::FnFilterValue)
8279
.filter("join", filters::join as interpreter::FnFilterValue)
8380
.filter("last", filters::last as interpreter::FnFilterValue)
@@ -88,20 +85,17 @@ impl ParserBuilder {
8885
.filter(
8986
"newline_to_br",
9087
filters::newline_to_br as interpreter::FnFilterValue,
91-
)
92-
.filter("plus", filters::plus as interpreter::FnFilterValue)
88+
).filter("plus", filters::plus as interpreter::FnFilterValue)
9389
.filter("prepend", filters::prepend as interpreter::FnFilterValue)
9490
.filter("remove", filters::remove as interpreter::FnFilterValue)
9591
.filter(
9692
"remove_first",
9793
filters::remove_first as interpreter::FnFilterValue,
98-
)
99-
.filter("replace", filters::replace as interpreter::FnFilterValue)
94+
).filter("replace", filters::replace as interpreter::FnFilterValue)
10095
.filter(
10196
"replace_first",
10297
filters::replace_first as interpreter::FnFilterValue,
103-
)
104-
.filter("reverse", filters::reverse as interpreter::FnFilterValue)
98+
).filter("reverse", filters::reverse as interpreter::FnFilterValue)
10599
.filter("round", filters::round as interpreter::FnFilterValue)
106100
.filter("rstrip", filters::rstrip as interpreter::FnFilterValue)
107101
.filter("size", filters::size as interpreter::FnFilterValue)
@@ -110,30 +104,25 @@ impl ParserBuilder {
110104
.filter(
111105
"sort_natural",
112106
filters::sort_natural as interpreter::FnFilterValue,
113-
)
114-
.filter("split", filters::split as interpreter::FnFilterValue)
107+
).filter("split", filters::split as interpreter::FnFilterValue)
115108
.filter("strip", filters::strip as interpreter::FnFilterValue)
116109
.filter(
117110
"strip_html",
118111
filters::strip_html as interpreter::FnFilterValue,
119-
)
120-
.filter(
112+
).filter(
121113
"strip_newlines",
122114
filters::strip_newlines as interpreter::FnFilterValue,
123-
)
124-
.filter("times", filters::times as interpreter::FnFilterValue)
115+
).filter("times", filters::times as interpreter::FnFilterValue)
125116
.filter("truncate", filters::truncate as interpreter::FnFilterValue)
126117
.filter(
127118
"truncatewords",
128119
filters::truncatewords as interpreter::FnFilterValue,
129-
)
130-
.filter("uniq", filters::uniq as interpreter::FnFilterValue)
120+
).filter("uniq", filters::uniq as interpreter::FnFilterValue)
131121
.filter("upcase", filters::upcase as interpreter::FnFilterValue)
132122
.filter(
133123
"url_decode",
134124
filters::url_decode as interpreter::FnFilterValue,
135-
)
136-
.filter(
125+
).filter(
137126
"url_encode",
138127
filters::url_encode as interpreter::FnFilterValue,
139128
)

0 commit comments

Comments
 (0)