Skip to content

Commit 57add9c

Browse files
emilioemilio
committed
Fix some clippy lints.
1 parent 63c1043 commit 57add9c

File tree

15 files changed

+38
-40
lines changed

15 files changed

+38
-40
lines changed

‎src/bindgen/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ impl ExportConfig {
364364
}
365365
}
366366
if let Some(ref prefix) = self.prefix {
367-
item_name.insert_str(0, &prefix);
367+
item_name.insert_str(0, prefix);
368368
}
369369
}
370370
}

‎src/bindgen/error.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ pub use crate::bindgen::cargo::cargo_toml::Error as CargoTomlError;
1111
pub use syn::parse::Error as ParseError;
1212

1313
#[derive(Debug)]
14+
#[allow(clippy::enum_variant_names)]
1415
pub enum Error {
1516
CargoMetadata(String, CargoMetadataError),
1617
CargoToml(String, CargoTomlError),

‎src/bindgen/ir/cfg.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ impl<'a> ToCondition for Cfg {
214214
let define = config
215215
.defines
216216
.iter()
217-
.find(|(key, ..)| DefineKey::Boolean(&cfg_name) == DefineKey::load(key));
217+
.find(|(key, ..)| DefineKey::Boolean(cfg_name) == DefineKey::load(key));
218218
if let Some((_, define)) = define {
219219
Some(Condition::Define(define.to_owned()))
220220
} else {
@@ -227,7 +227,7 @@ impl<'a> ToCondition for Cfg {
227227
}
228228
Cfg::Named(ref cfg_name, ref cfg_value) => {
229229
let define = config.defines.iter().find(|(key, ..)| {
230-
DefineKey::Named(&cfg_name, &cfg_value) == DefineKey::load(key)
230+
DefineKey::Named(cfg_name, cfg_value) == DefineKey::load(key)
231231
});
232232
if let Some((_, define)) = define {
233233
Some(Condition::Define(define.to_owned()))

‎src/bindgen/ir/constant.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ impl Literal {
340340
// In C++, same order as defined is required.
341341
let ordered_fields = out.bindings().struct_field_names(path);
342342
for ordered_key in ordered_fields.iter() {
343-
if let Some(ref lit) = fields.get(ordered_key) {
343+
if let Some(lit) = fields.get(ordered_key) {
344344
if !is_first_field {
345345
write!(out, ", ");
346346
} else {
@@ -389,7 +389,7 @@ impl Constant {
389389
}
390390
};
391391

392-
let mut lit = Literal::load(&expr)?;
392+
let mut lit = Literal::load(expr)?;
393393

394394
if let Some(ref associated_to) = associated_to {
395395
ty.replace_self_with(associated_to);
@@ -551,7 +551,7 @@ impl Constant {
551551
ref fields,
552552
ref path,
553553
..
554-
} if out.bindings().struct_is_transparent(path) => &fields.iter().next().unwrap().1,
554+
} if out.bindings().struct_is_transparent(path) => fields.iter().next().unwrap().1,
555555
_ => &self.value,
556556
};
557557

‎src/bindgen/ir/enumeration.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ impl Item for Enum {
568568
inline,
569569
inline_casts,
570570
} => VariantBody::Body {
571-
name: r.apply(&name, IdentifierType::StructMember).into_owned(),
571+
name: r.apply(name, IdentifierType::StructMember).into_owned(),
572572
body: body.clone(),
573573
inline,
574574
inline_casts,

‎src/bindgen/ir/function.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ impl Source for Function {
256256
}
257257
}
258258
}
259-
cdecl::write_func(out, &func, false, config);
259+
cdecl::write_func(out, func, false, config);
260260

261261
if !func.extern_decl {
262262
if let Some(ref postfix) = postfix {
@@ -305,7 +305,7 @@ impl Source for Function {
305305
}
306306
}
307307
}
308-
cdecl::write_func(out, &func, true, config);
308+
cdecl::write_func(out, func, true, config);
309309
if !func.extern_decl {
310310
if let Some(ref postfix) = postfix {
311311
out.new_line();

‎src/bindgen/ir/repr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ impl Repr {
6060
}
6161
None
6262
})
63-
.flat_map(|nested| nested)
63+
.flatten()
6464
.filter_map(|meta| match meta {
6565
syn::NestedMeta::Meta(syn::Meta::Path(path)) => {
6666
Some((path.segments.first().unwrap().ident.to_string(), None))

‎src/bindgen/ir/ty.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ impl Type {
805805
ty.add_monomorphs(library, out);
806806
}
807807
Type::Path(ref generic) => {
808-
if generic.generics().is_empty() || out.contains(&generic) {
808+
if generic.generics().is_empty() || out.contains(generic) {
809809
return;
810810
}
811811
let path = generic.path();
@@ -892,7 +892,7 @@ impl Type {
892892
return;
893893
}
894894

895-
if let Some(mangled_path) = monomorphs.mangle_path(&generic_path) {
895+
if let Some(mangled_path) = monomorphs.mangle_path(generic_path) {
896896
*generic_path = GenericPath::new(mangled_path.clone(), vec![]);
897897
} else {
898898
warn!(

‎src/bindgen/mangle.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ fn generics() {
157157
}
158158

159159
fn path(path: &str) -> Type {
160-
generic_path(path, &vec![])
160+
generic_path(path, &[])
161161
}
162162

163163
fn generic_path(path: &str, generics: &[Type]) -> Type {
@@ -168,15 +168,15 @@ fn generics() {
168168

169169
// Foo<f32> => Foo_f32
170170
assert_eq!(
171-
mangle_path(&Path::new("Foo"), &vec![float()], &MangleConfig::default()),
171+
mangle_path(&Path::new("Foo"), &[float()], &MangleConfig::default()),
172172
Path::new("Foo_f32")
173173
);
174174

175175
// Foo<Bar<f32>> => Foo_Bar_f32
176176
assert_eq!(
177177
mangle_path(
178178
&Path::new("Foo"),
179-
&vec![generic_path("Bar", &[float()])],
179+
&[generic_path("Bar", &[float()])],
180180
&MangleConfig::default(),
181181
),
182182
Path::new("Foo_Bar_f32")
@@ -205,7 +205,7 @@ fn generics() {
205205
assert_eq!(
206206
mangle_path(
207207
&Path::new("Foo"),
208-
&vec![generic_path("Bar", &[float()])],
208+
&[generic_path("Bar", &[float()])],
209209
&MangleConfig {
210210
remove_underscores: true,
211211
rename_types: PascalCase,
@@ -218,7 +218,7 @@ fn generics() {
218218
assert_eq!(
219219
mangle_path(
220220
&Path::new("Foo"),
221-
&vec![generic_path("Bar", &[c_char()])],
221+
&[generic_path("Bar", &[c_char()])],
222222
&MangleConfig {
223223
remove_underscores: true,
224224
rename_types: PascalCase,

‎src/bindgen/parser.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ impl<'a> Parser<'a> {
163163
}
164164
}
165165

166-
for (dep_pkg, cfg) in self.lib.as_ref().unwrap().dependencies(&pkg) {
166+
for (dep_pkg, cfg) in self.lib.as_ref().unwrap().dependencies(pkg) {
167167
if !self.should_parse_dependency(&dep_pkg.name) {
168168
continue;
169169
}
@@ -300,7 +300,7 @@ impl<'a> Parser<'a> {
300300
debug_assert_eq!(mod_dir.is_some(), submod_dir.is_some());
301301
// We process the items first then the nested modules.
302302
let nested_modules = self.out.load_syn_crate_mod(
303-
&self.config,
303+
self.config,
304304
&self.binding_crate_name,
305305
&pkg.name,
306306
Cfg::join(&self.cfg_stack).as_ref(),
@@ -708,7 +708,7 @@ impl Parse {
708708
match (is_extern_c, exported_name) {
709709
(true, Some(exported_name)) => {
710710
let path = Path::new(exported_name);
711-
match Function::load(path, self_type, &sig, false, &attrs, mod_cfg) {
711+
match Function::load(path, self_type, sig, false, attrs, mod_cfg) {
712712
Ok(func) => {
713713
info!("Take {}.", loggable_item_name());
714714
self.functions.push(func);
@@ -1010,7 +1010,7 @@ impl Parse {
10101010
item: &syn::ItemMacro,
10111011
) {
10121012
let name = match item.mac.path.segments.last() {
1013-
Some(ref n) => n.ident.to_string(),
1013+
Some(n) => n.ident.to_string(),
10141014
None => return,
10151015
};
10161016

‎src/bindgen/rename.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ impl RenameRule {
8686
result.push('_');
8787
}
8888

89-
result.push_str(&RenameRule::ScreamingSnakeCase.apply(&text, context));
89+
result.push_str(&RenameRule::ScreamingSnakeCase.apply(text, context));
9090
result
9191
}
9292
})

‎src/bindgen/writer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ impl<'a, F: Write> SourceWriter<'a, F> {
8282
}
8383

8484
pub fn bindings(&self) -> &Bindings {
85-
&self.bindings
85+
self.bindings
8686
}
8787

8888
/// Takes a function that writes source and returns the maximum line length
@@ -208,7 +208,7 @@ impl<'a, F: Write> SourceWriter<'a, F> {
208208
items: &[S],
209209
list_type: ListType<'b>,
210210
) {
211-
for (i, ref item) in items.iter().enumerate() {
211+
for (i, item) in items.iter().enumerate() {
212212
item.write(&self.bindings.config, self);
213213

214214
match list_type {
@@ -231,7 +231,7 @@ impl<'a, F: Write> SourceWriter<'a, F> {
231231
) {
232232
let align_length = self.line_length_for_align();
233233
self.push_set_spaces(align_length);
234-
for (i, ref item) in items.iter().enumerate() {
234+
for (i, item) in items.iter().enumerate() {
235235
item.write(&self.bindings.config, self);
236236

237237
match list_type {

‎src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ fn load_bindings<'a>(input: &Path, matches: &ArgMatches<'a>) -> Result<Bindings,
8787
None => Config::from_root_or_default(input),
8888
};
8989

90-
apply_config_overrides(&mut config, &matches);
90+
apply_config_overrides(&mut config, matches);
9191

9292
return Builder::new()
9393
.with_config(config)
@@ -121,7 +121,7 @@ fn load_bindings<'a>(input: &Path, matches: &ArgMatches<'a>) -> Result<Bindings,
121121
}
122122
};
123123

124-
apply_config_overrides(&mut config, &matches);
124+
apply_config_overrides(&mut config, matches);
125125

126126
Builder::new()
127127
.with_config(config)

‎tests/profile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fn get_contents_of_dir(path: &Path) -> Vec<String> {
6868
path.read_dir()
6969
.unwrap()
7070
.map(|f| f.unwrap().file_name().to_str().unwrap().to_string())
71-
.filter(|name| !name.starts_with("."))
71+
.filter(|name| !name.starts_with('.'))
7272
.collect()
7373
}
7474

‎tests/tests.rs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,8 @@ fn compile(
105105
if let Ok(extra_flags) = env::var("CXXFLAGS") {
106106
command.args(extra_flags.split_whitespace());
107107
}
108-
} else {
109-
if let Ok(extra_flags) = env::var("CFLAGS") {
110-
command.args(extra_flags.split_whitespace());
111-
}
108+
} else if let Ok(extra_flags) = env::var("CFLAGS") {
109+
command.args(extra_flags.split_whitespace());
112110
}
113111

114112
if let Some(style) = style {
@@ -142,8 +140,9 @@ fn compile(
142140
}
143141
}
144142

145-
const SKIP_WARNING_AS_ERROR_SUFFIX: &'static str = ".skip_warning_as_error";
143+
const SKIP_WARNING_AS_ERROR_SUFFIX: &str = ".skip_warning_as_error";
146144

145+
#[allow(clippy::too_many_arguments)]
147146
fn run_compile_test(
148147
cbindgen_path: &'static str,
149148
name: &'static str,
@@ -196,10 +195,8 @@ fn run_compile_test(
196195
// We already generated an identical file previously.
197196
if env::var_os("CBINDGEN_TEST_VERIFY").is_some() {
198197
assert!(!generated_file.exists());
199-
} else {
200-
if generated_file.exists() {
201-
fs::remove_file(&generated_file).unwrap();
202-
}
198+
} else if generated_file.exists() {
199+
fs::remove_file(&generated_file).unwrap();
203200
}
204201
} else {
205202
if env::var_os("CBINDGEN_TEST_VERIFY").is_some() {
@@ -248,7 +245,7 @@ fn test_file(cbindgen_path: &'static str, name: &'static str, filename: &'static
248245
run_compile_test(
249246
cbindgen_path,
250247
name,
251-
&test,
248+
test,
252249
tmp_dir,
253250
Language::C,
254251
*cpp_compat,
@@ -261,7 +258,7 @@ fn test_file(cbindgen_path: &'static str, name: &'static str, filename: &'static
261258
run_compile_test(
262259
cbindgen_path,
263260
name,
264-
&test,
261+
test,
265262
tmp_dir,
266263
Language::Cxx,
267264
/* cpp_compat = */ false,
@@ -275,7 +272,7 @@ fn test_file(cbindgen_path: &'static str, name: &'static str, filename: &'static
275272
run_compile_test(
276273
cbindgen_path,
277274
name,
278-
&test,
275+
test,
279276
tmp_dir,
280277
Language::Cython,
281278
/* cpp_compat = */ false,

0 commit comments

Comments
 (0)