Skip to content

Commit aee6c88

Browse files
authored
add embarks standard lints (#11)
1 parent b814fce commit aee6c88

File tree

3 files changed

+88
-10
lines changed

3 files changed

+88
-10
lines changed

.cargo/config.toml

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
[target.'cfg(all())']
2+
rustflags = [
3+
# BEGIN - Embark standard lints v6 for Rust 1.55+
4+
# do not change or add/remove here, but one can add exceptions after this section
5+
# for more info see: <https://github.com/EmbarkStudios/rust-ecosystem/issues/59>
6+
"-Dunsafe_code",
7+
"-Wclippy::all",
8+
"-Wclippy::await_holding_lock",
9+
"-Wclippy::char_lit_as_u8",
10+
"-Wclippy::checked_conversions",
11+
"-Wclippy::dbg_macro",
12+
"-Wclippy::debug_assert_with_mut_call",
13+
"-Wclippy::doc_markdown",
14+
"-Wclippy::empty_enum",
15+
"-Wclippy::enum_glob_use",
16+
"-Wclippy::exit",
17+
"-Wclippy::expl_impl_clone_on_copy",
18+
"-Wclippy::explicit_deref_methods",
19+
"-Wclippy::explicit_into_iter_loop",
20+
"-Wclippy::fallible_impl_from",
21+
"-Wclippy::filter_map_next",
22+
"-Wclippy::flat_map_option",
23+
"-Wclippy::float_cmp_const",
24+
"-Wclippy::fn_params_excessive_bools",
25+
"-Wclippy::from_iter_instead_of_collect",
26+
"-Wclippy::if_let_mutex",
27+
"-Wclippy::implicit_clone",
28+
"-Wclippy::imprecise_flops",
29+
"-Wclippy::inefficient_to_string",
30+
"-Wclippy::invalid_upcast_comparisons",
31+
"-Wclippy::large_digit_groups",
32+
"-Wclippy::large_stack_arrays",
33+
"-Wclippy::large_types_passed_by_value",
34+
"-Wclippy::let_unit_value",
35+
"-Wclippy::linkedlist",
36+
"-Wclippy::lossy_float_literal",
37+
"-Wclippy::macro_use_imports",
38+
"-Wclippy::manual_ok_or",
39+
"-Wclippy::map_err_ignore",
40+
"-Wclippy::map_flatten",
41+
"-Wclippy::map_unwrap_or",
42+
"-Wclippy::match_on_vec_items",
43+
"-Wclippy::match_same_arms",
44+
"-Wclippy::match_wild_err_arm",
45+
"-Wclippy::match_wildcard_for_single_variants",
46+
"-Wclippy::mem_forget",
47+
"-Wclippy::mismatched_target_os",
48+
"-Wclippy::missing_enforced_import_renames",
49+
"-Wclippy::mut_mut",
50+
"-Wclippy::mutex_integer",
51+
"-Wclippy::needless_borrow",
52+
"-Wclippy::needless_continue",
53+
"-Wclippy::needless_for_each",
54+
"-Wclippy::option_option",
55+
"-Wclippy::path_buf_push_overwrite",
56+
"-Wclippy::ptr_as_ptr",
57+
"-Wclippy::rc_mutex",
58+
"-Wclippy::ref_option_ref",
59+
"-Wclippy::rest_pat_in_fully_bound_structs",
60+
"-Wclippy::same_functions_in_if_condition",
61+
"-Wclippy::semicolon_if_nothing_returned",
62+
"-Wclippy::single_match_else",
63+
"-Wclippy::string_add_assign",
64+
"-Wclippy::string_add",
65+
"-Wclippy::string_lit_as_bytes",
66+
"-Wclippy::string_to_string",
67+
"-Wclippy::todo",
68+
"-Wclippy::trait_duplication_in_bounds",
69+
"-Wclippy::unimplemented",
70+
"-Wclippy::unnested_or_patterns",
71+
"-Wclippy::unused_self",
72+
"-Wclippy::useless_transmute",
73+
"-Wclippy::verbose_file_reads",
74+
"-Wclippy::zero_sized_map_values",
75+
"-Wfuture_incompatible",
76+
"-Wnonstandard_style",
77+
"-Wrust_2018_idioms",
78+
# END - Embark standard lints v6 for Rust 1.55+
79+
]

src/collector/mod.rs

+5-6
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,19 @@ impl MetricBuilder {
5858
}
5959
}
6060
pub fn value(&mut self, v: f64) {
61-
self.value = Some(v)
61+
self.value = Some(v);
6262
}
6363
pub fn targets(&mut self, t: Vec<targets::Target>) {
64-
self.targets.extend(t.into_iter())
64+
self.targets.extend(t.into_iter());
6565
}
6666
pub fn parser(&mut self, p: Box<dyn crate::parsers::Parser + Sync + Send>) {
67-
self.parser = Some(p)
67+
self.parser = Some(p);
6868
}
6969
pub fn pipeline_stages(
7070
&mut self,
7171
ps: Vec<Box<dyn crate::pipeline_stages::PipelineStage + Sync + Send>>,
7272
) {
73-
self.pipeline_stages.extend(ps.into_iter())
73+
self.pipeline_stages.extend(ps.into_iter());
7474
}
7575

7676
pub fn build(self) -> Metric {
@@ -118,8 +118,7 @@ impl Metric {
118118
labels.sort();
119119

120120
let value = match (parsed.value, self.value) {
121-
(Some(value), _) => Ok(value),
122-
(_, Some(value)) => Ok(value),
121+
(Some(value), _) | (_, Some(value)) => Ok(value),
123122
(None, None) => Err(CollectError::MissingValue(String::from(
124123
"expected either a constant or a parsed value",
125124
))),

src/config/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ pub fn parse(path: String) -> serde_yaml::Result<crate::DataMetrics> {
6464
pattern,
6565
} => Box::new(crate::parsers::regex::RegexParser::new(
6666
pattern,
67-
labels.to_vec(),
68-
value.to_owned(),
67+
labels.clone(),
68+
value.clone(),
6969
)),
7070
Parser::Json { labels, value } => Box::new(crate::parsers::json::JsonParser::new(
71-
labels.to_vec(),
72-
value.to_owned(),
71+
labels.clone(),
72+
value.clone(),
7373
)),
7474
};
7575

0 commit comments

Comments
 (0)