Skip to content

Commit 9f801be

Browse files
gybrishNiall McDonagh
gybrish
and
Niall McDonagh
authored
Fixed up clippy warnrings/errors (#296)
Co-authored-by: Niall McDonagh <nmcdonagh@vectra.ai>
1 parent 373e7de commit 9f801be

File tree

29 files changed

+120
-122
lines changed

29 files changed

+120
-122
lines changed

‎fluent-bundle/benches/resolver.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fn get_strings(tests: &[&'static str]) -> HashMap<&'static str, String> {
2525
let path = format!("./benches/{}.ftl", test);
2626
ftl_strings.insert(*test, read_file(&path).expect("Couldn't load file"));
2727
}
28-
return ftl_strings;
28+
ftl_strings
2929
}
3030

3131
fn get_ids(res: &FluentResource) -> Vec<String> {
@@ -62,7 +62,7 @@ fn add_functions<R>(name: &'static str, bundle: &mut FluentBundle<R>) {
6262
"preferences" => {
6363
bundle
6464
.add_function("PLATFORM", |_args, _named_args| {
65-
return "linux".into();
65+
"linux".into()
6666
})
6767
.expect("Failed to add a function to the bundle.");
6868
}
@@ -133,7 +133,7 @@ fn resolver_bench(c: &mut Criterion) {
133133
bundle.write_pattern(&mut s, attr.value(), args.as_ref(), &mut errors);
134134
s.clear();
135135
}
136-
assert!(errors.len() == 0, "Resolver errors: {:#?}", errors);
136+
assert!(errors.is_empty(), "Resolver errors: {:#?}", errors);
137137
}
138138
})
139139
});
@@ -156,7 +156,7 @@ fn resolver_bench(c: &mut Criterion) {
156156
for attr in msg.attributes() {
157157
let _ = bundle.format_pattern(attr.value(), args.as_ref(), &mut errors);
158158
}
159-
assert!(errors.len() == 0, "Resolver errors: {:#?}", errors);
159+
assert!(errors.is_empty(), "Resolver errors: {:#?}", errors);
160160
}
161161
})
162162
});

‎fluent-bundle/benches/resolver_iai.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fn add_functions<R>(name: &'static str, bundle: &mut FluentBundle<R>) {
99
"preferences" => {
1010
bundle
1111
.add_function("PLATFORM", |_args, _named_args| {
12-
return "linux".into();
12+
"linux".into()
1313
})
1414
.expect("Failed to add a function to the bundle.");
1515
}
@@ -71,7 +71,7 @@ fn iai_resolve_preferences() {
7171
.expect("Failed to write a pattern.");
7272
s.clear();
7373
}
74-
assert!(errors.len() == 0, "Resolver errors: {:#?}", errors);
74+
assert!(errors.is_empty(), "Resolver errors: {:#?}", errors);
7575
}
7676
}
7777
}

‎fluent-bundle/examples/custom_formatter.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use fluent_bundle::{FluentArgs, FluentBundle, FluentResource, FluentValue};
1010

1111
fn custom_formatter<M: MemoizerKind>(num: &FluentValue, _intls: &M) -> Option<String> {
1212
match num {
13-
FluentValue::Number(n) => Some(format!("CUSTOM({})", n.value).into()),
13+
FluentValue::Number(n) => Some(format!("CUSTOM({})", n.value)),
1414
_ => None,
1515
}
1616
}
@@ -59,7 +59,7 @@ key-var-with-arg = Here is a variable formatted with an argument { NUMBER($num,
5959
.get_message("key-implicit")
6060
.expect("Message doesn't exist.");
6161
let pattern = msg.value().expect("Message has no value.");
62-
let value = bundle.format_pattern(&pattern, None, &mut errors);
62+
let value = bundle.format_pattern(pattern, None, &mut errors);
6363
assert_eq!(value, "Here is an implicitly encoded number: 5.");
6464
println!("{}", value);
6565

@@ -72,7 +72,7 @@ key-var-with-arg = Here is a variable formatted with an argument { NUMBER($num,
7272
.get_message("key-implicit")
7373
.expect("Message doesn't exist.");
7474
let pattern = msg.value().expect("Message has no value.");
75-
let value = bundle.format_pattern(&pattern, None, &mut errors);
75+
let value = bundle.format_pattern(pattern, None, &mut errors);
7676
assert_eq!(value, "Here is an implicitly encoded number: CUSTOM(5).");
7777
println!("{}", value);
7878

@@ -82,7 +82,7 @@ key-var-with-arg = Here is a variable formatted with an argument { NUMBER($num,
8282
.get_message("key-explicit")
8383
.expect("Message doesn't exist.");
8484
let pattern = msg.value().expect("Message has no value.");
85-
let value = bundle.format_pattern(&pattern, None, &mut errors);
85+
let value = bundle.format_pattern(pattern, None, &mut errors);
8686
assert_eq!(value, "Here is an explicitly encoded number: CUSTOM(5).");
8787
println!("{}", value);
8888

@@ -92,7 +92,7 @@ key-var-with-arg = Here is a variable formatted with an argument { NUMBER($num,
9292
let pattern = msg.value().expect("Message has no value.");
9393
let mut args = FluentArgs::new();
9494
args.set("num", FluentValue::from(-15));
95-
let value = bundle.format_pattern(&pattern, Some(&args), &mut errors);
95+
let value = bundle.format_pattern(pattern, Some(&args), &mut errors);
9696
assert_eq!(
9797
value,
9898
"Here is an implicitly encoded variable: CUSTOM(-15)."
@@ -105,7 +105,7 @@ key-var-with-arg = Here is a variable formatted with an argument { NUMBER($num,
105105
let pattern = msg.value().expect("Message has no value.");
106106
let mut args = FluentArgs::new();
107107
args.set("num", FluentValue::from(-15));
108-
let value = bundle.format_pattern(&pattern, Some(&args), &mut errors);
108+
let value = bundle.format_pattern(pattern, Some(&args), &mut errors);
109109
assert_eq!(
110110
value,
111111
"Here is an explicitly encoded variable: CUSTOM(-15)."
@@ -129,7 +129,7 @@ key-var-with-arg = Here is a variable formatted with an argument { NUMBER($num,
129129
},
130130
);
131131
args.set("num", num);
132-
let value = bundle.format_pattern(&pattern, Some(&args), &mut errors);
132+
let value = bundle.format_pattern(pattern, Some(&args), &mut errors);
133133

134134
// Notice, that since we specificed minimum and maximum fraction digits options
135135
// to be 1 and 8 when construction the argument, and then the minimum fraction

‎fluent-bundle/examples/external_arguments.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ unread-emails =
2828
.expect("Message doesn't exist.");
2929
let mut errors = vec![];
3030
let pattern = msg.value().expect("Message has no value.");
31-
let value = bundle.format_pattern(&pattern, Some(&args), &mut errors);
31+
let value = bundle.format_pattern(pattern, Some(&args), &mut errors);
3232
println!("{}", value);
3333

3434
let msg = bundle.get_message("ref").expect("Message doesn't exist.");
3535
let mut errors = vec![];
3636
let pattern = msg.value().expect("Message has no value.");
37-
let value = bundle.format_pattern(&pattern, Some(&args), &mut errors);
37+
let value = bundle.format_pattern(pattern, Some(&args), &mut errors);
3838
println!("{}", value);
3939

4040
let mut args = FluentArgs::new();
@@ -45,6 +45,6 @@ unread-emails =
4545
.expect("Message doesn't exist.");
4646
let mut errors = vec![];
4747
let pattern = msg.value().expect("Message has no value.");
48-
let value = bundle.format_pattern(&pattern, Some(&args), &mut errors);
48+
let value = bundle.format_pattern(pattern, Some(&args), &mut errors);
4949
println!("{}", value);
5050
}

‎fluent-bundle/examples/functions.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fn main() {
1717
// Test for a simple function that returns a string
1818
bundle
1919
.add_function("HELLO", |_args, _named_args| {
20-
return "I'm a function!".into();
20+
"I'm a function!".into()
2121
})
2222
.expect("Failed to add a function to the bundle.");
2323

@@ -61,22 +61,22 @@ fn main() {
6161
.expect("Message doesn't exist.");
6262
let mut errors = vec![];
6363
let pattern = msg.value().expect("Message has no value.");
64-
let value = bundle.format_pattern(&pattern, None, &mut errors);
64+
let value = bundle.format_pattern(pattern, None, &mut errors);
6565
assert_eq!(&value, "Hey there! \u{2068}I'm a function!\u{2069}");
6666

6767
let msg = bundle
6868
.get_message("meaning-of-life")
6969
.expect("Message doesn't exist.");
7070
let mut errors = vec![];
7171
let pattern = msg.value().expect("Message has no value.");
72-
let value = bundle.format_pattern(&pattern, None, &mut errors);
72+
let value = bundle.format_pattern(pattern, None, &mut errors);
7373
assert_eq!(&value, "The answer to life, the universe, and everything");
7474

7575
let msg = bundle
7676
.get_message("all-your-base")
7777
.expect("Message doesn't exist.");
7878
let mut errors = vec![];
7979
let pattern = msg.value().expect("Message has no value.");
80-
let value = bundle.format_pattern(&pattern, None, &mut errors);
80+
let value = bundle.format_pattern(pattern, None, &mut errors);
8181
assert_eq!(&value, "All your base belong to us");
8282
}

‎fluent-bundle/examples/hello.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ fn main() {
1313
.expect("Message doesn't exist.");
1414
let mut errors = vec![];
1515
let pattern = msg.value().expect("Message has no value.");
16-
let value = bundle.format_pattern(&pattern, None, &mut errors);
16+
let value = bundle.format_pattern(pattern, None, &mut errors);
1717
assert_eq!(&value, "Hello, world!");
1818
}

‎fluent-bundle/examples/message_reference.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ bazbar = { baz } Bar
2020
.expect("Message doesn't exist.");
2121
let mut errors = vec![];
2222
let pattern = msg.value().expect("Message has no value.");
23-
let value = bundle.format_pattern(&pattern, None, &mut errors);
23+
let value = bundle.format_pattern(pattern, None, &mut errors);
2424
println!("{}", value);
2525

2626
let msg = bundle
2727
.get_message("bazbar")
2828
.expect("Message doesn't exist.");
2929
let mut errors = vec![];
3030
let pattern = msg.value().expect("Message has no value.");
31-
let value = bundle.format_pattern(&pattern, None, &mut errors);
31+
let value = bundle.format_pattern(pattern, None, &mut errors);
3232
println!("{}", value);
3333
}

‎fluent-bundle/examples/selector.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ hello-world2 = Hello { $name ->
2525
.expect("Message doesn't exist.");
2626
let mut errors = vec![];
2727
let pattern = msg.value().expect("Message has no value.");
28-
let value = bundle.format_pattern(&pattern, None, &mut errors);
28+
let value = bundle.format_pattern(pattern, None, &mut errors);
2929
println!("{}", value);
3030

3131
let mut args = FluentArgs::new();
@@ -36,6 +36,6 @@ hello-world2 = Hello { $name ->
3636
.expect("Message doesn't exist.");
3737
let mut errors = vec![];
3838
let pattern = msg.value().expect("Message has no value.");
39-
let value = bundle.format_pattern(&pattern, Some(&args), &mut errors);
39+
let value = bundle.format_pattern(pattern, Some(&args), &mut errors);
4040
println!("{}", value);
4141
}

‎fluent-bundle/examples/simple-app.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fn get_available_locales() -> Result<Vec<LanguageIdentifier>, io::Error> {
6969
}
7070
}
7171
}
72-
return Ok(locales);
72+
Ok(locales)
7373
}
7474

7575
static L10N_RESOURCES: &[&str] = &["simple.ftl"];
@@ -82,7 +82,7 @@ fn main() {
8282
// take the second argument as a comma-separated
8383
// list of requested locales.
8484
let requested = args.get(2).map_or(vec![], |arg| {
85-
arg.split(",")
85+
arg.split(',')
8686
.map(|s| -> LanguageIdentifier { s.parse().expect("Parsing locale failed.") })
8787
.collect()
8888
});
@@ -126,7 +126,7 @@ fn main() {
126126
match args.get(1) {
127127
Some(input) => {
128128
// 7.1. Cast it to a number.
129-
match isize::from_str(&input) {
129+
match isize::from_str(input) {
130130
Ok(i) => {
131131
// 7.2. Construct a map of arguments
132132
// to format the message.
@@ -139,7 +139,7 @@ fn main() {
139139
.get_message("response-msg")
140140
.expect("Message doesn't exist.");
141141
let pattern = msg.value().expect("Message has no value.");
142-
let value = bundle.format_pattern(&pattern, Some(&args), &mut errors);
142+
let value = bundle.format_pattern(pattern, Some(&args), &mut errors);
143143
println!("{}", value);
144144
}
145145
Err(err) => {
@@ -151,7 +151,7 @@ fn main() {
151151
.get_message("input-parse-error")
152152
.expect("Message doesn't exist.");
153153
let pattern = msg.value().expect("Message has no value.");
154-
let value = bundle.format_pattern(&pattern, Some(&args), &mut errors);
154+
let value = bundle.format_pattern(pattern, Some(&args), &mut errors);
155155
println!("{}", value);
156156
}
157157
}
@@ -162,7 +162,7 @@ fn main() {
162162
.get_message("missing-arg-error")
163163
.expect("Message doesn't exist.");
164164
let pattern = msg.value().expect("Message has no value.");
165-
let value = bundle.format_pattern(&pattern, None, &mut errors);
165+
let value = bundle.format_pattern(pattern, None, &mut errors);
166166
println!("{}", value);
167167
}
168168
}

‎fluent-bundle/src/entry.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub trait GetEntry {
3535
fn get_entry_function(&self, id: &str) -> Option<&FluentFunction>;
3636
}
3737

38-
impl<'bundle, R: Borrow<FluentResource>, M> GetEntry for FluentBundle<R, M> {
38+
impl<R: Borrow<FluentResource>, M> GetEntry for FluentBundle<R, M> {
3939
fn get_entry_message(&self, id: &str) -> Option<&ast::Message<&str>> {
4040
self.entries.get(id).and_then(|ref entry| match entry {
4141
Entry::Message((resource_idx, entry_idx)) => {

0 commit comments

Comments
 (0)