Skip to content

Commit 8c28e51

Browse files
author
daniel.eades
committed
remove explicit 'iter' loops (clippy::explicit_iter_loop)
1 parent d7a21a0 commit 8c28e51

File tree

5 files changed

+13
-17
lines changed

5 files changed

+13
-17
lines changed

graphql_client_cli/src/introspection_schema.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,12 @@ mod tests {
151151
fn it_errors_invalid_headers() {
152152
// https://tools.ietf.org/html/rfc7230#section-3.2
153153

154-
for input in [
154+
for input in &[
155155
"X-Name Value", // error: colon required for name/value pair
156156
": Value", // error: field name must be
157157
"X Name: Value", // error: no whitespace in field name
158158
"X\tName: Value", // error: no whitespace in field name (tab)
159-
]
160-
.iter()
161-
{
159+
] {
162160
let header = Header::from_str(input);
163161

164162
assert!(header.is_err(), "Expected error: [{}]", input);
@@ -178,7 +176,7 @@ mod tests {
178176
value: "Value:".to_string(),
179177
};
180178

181-
for (input, expected) in [
179+
for (input, expected) in &[
182180
("X-Name: Value", &expected1), // ideal
183181
("X-Name:Value", &expected1), // no optional whitespace
184182
("X-Name: Value ", &expected1), // with optional whitespace
@@ -187,9 +185,7 @@ mod tests {
187185
// not allowed per RFC, but we'll forgive
188186
("X-Name : Value", &expected1),
189187
(" X-Name: Value", &expected1),
190-
]
191-
.iter()
192-
{
188+
] {
193189
let header = Header::from_str(input);
194190

195191
assert!(header.is_ok(), "Expected ok: [{}]", input);

graphql_client_codegen/src/query.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ fn resolve_union_selection<'doc, T>(
252252
where
253253
T: graphql_parser::query::Text<'doc>,
254254
{
255-
for item in selection_set.items.iter() {
255+
for item in &selection_set.items {
256256
match item {
257257
graphql_parser::query::Selection::Field(field) => {
258258
if field.name.as_ref() == TYPENAME_FIELD {
@@ -298,7 +298,7 @@ fn resolve_object_selection<'a, 'doc, T>(
298298
where
299299
T: graphql_parser::query::Text<'doc>,
300300
{
301-
for item in selection_set.items.iter() {
301+
for item in &selection_set.items {
302302
match item {
303303
graphql_parser::query::Selection::Field(field) => {
304304
if field.name.as_ref() == TYPENAME_FIELD {

graphql_client_codegen/src/query/validation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::schema::TypeId;
44
pub(super) fn validate_typename_presence(
55
query: &BoundQuery<'_>,
66
) -> Result<(), QueryValidationError> {
7-
for fragment in query.query.fragments.iter() {
7+
for fragment in &query.query.fragments {
88
let type_id = match fragment.on {
99
id @ TypeId::Interface(_) | id @ TypeId::Union(_) => id,
1010
_ => continue,

graphql_client_codegen/src/schema/graphql_parser_conversion.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ fn ingest_object<'doc, T>(
179179
.unwrap();
180180
let mut field_ids = Vec::with_capacity(obj.fields.len());
181181

182-
for field in obj.fields.iter_mut() {
182+
for field in &mut obj.fields {
183183
let field = super::StoredField {
184184
name: field.name.as_ref().into(),
185185
r#type: resolve_field_type(schema, &field.field_type),
@@ -216,7 +216,7 @@ fn ingest_object_type_extension<'doc, T>(
216216
.unwrap();
217217
let mut field_ids = Vec::with_capacity(ext.fields.len());
218218

219-
for field in ext.fields.iter_mut() {
219+
for field in &mut ext.fields {
220220
let field = super::StoredField {
221221
name: field.name.as_ref().into(),
222222
r#type: resolve_field_type(schema, &field.field_type),
@@ -285,7 +285,7 @@ fn ingest_interface<'doc, T>(
285285

286286
let mut field_ids = Vec::with_capacity(interface.fields.len());
287287

288-
for field in interface.fields.iter_mut() {
288+
for field in &mut interface.fields {
289289
let field = super::StoredField {
290290
name: field.name.as_ref().into(),
291291
r#type: resolve_field_type(schema, &field.field_type),

graphql_query_derive/src/attributes.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub fn ident_exists(ast: &syn::DeriveInput, ident: &str) -> Result<(), syn::Erro
2020
.ok_or_else(|| syn::Error::new_spanned(ast, "The graphql attribute is missing"))?;
2121

2222
if let syn::Meta::List(items) = &attribute.parse_meta().expect("Attribute is well formatted") {
23-
for item in items.nested.iter() {
23+
for item in &items.nested {
2424
if let syn::NestedMeta::Meta(syn::Meta::Path(path)) = item {
2525
if let Some(ident_) = path.get_ident() {
2626
if ident_ == ident {
@@ -46,7 +46,7 @@ pub fn extract_attr(ast: &syn::DeriveInput, attr: &str) -> Result<String, syn::E
4646
.find(|attr| attr.path == graphql_path)
4747
.ok_or_else(|| syn::Error::new_spanned(ast, "The graphql attribute is missing"))?;
4848
if let syn::Meta::List(items) = &attribute.parse_meta().expect("Attribute is well formatted") {
49-
for item in items.nested.iter() {
49+
for item in &items.nested {
5050
if let syn::NestedMeta::Meta(syn::Meta::NameValue(name_value)) = item {
5151
let syn::MetaNameValue { path, lit, .. } = name_value;
5252
if let Some(ident) = path.get_ident() {
@@ -75,7 +75,7 @@ pub fn extract_attr_list(ast: &syn::DeriveInput, attr: &str) -> Result<Vec<Strin
7575
.find(|attr| attr.path == graphql_path)
7676
.ok_or_else(|| syn::Error::new_spanned(ast, "The graphql attribute is missing"))?;
7777
if let syn::Meta::List(items) = &attribute.parse_meta().expect("Attribute is well formatted") {
78-
for item in items.nested.iter() {
78+
for item in &items.nested {
7979
if let syn::NestedMeta::Meta(syn::Meta::List(value_list)) = item {
8080
if let Some(ident) = value_list.path.get_ident() {
8181
if ident == attr {

0 commit comments

Comments
 (0)