Skip to content

Commit cdb4883

Browse files
committed
wip
1 parent a6cdb8c commit cdb4883

File tree

6 files changed

+25
-51
lines changed

6 files changed

+25
-51
lines changed

Cargo.lock

Lines changed: 10 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ documentation = "https://github.com/dotansimha/graphql-tools-rs"
1111
authors = ["Dotan Simha <[email protected]>"]
1212

1313
[dependencies]
14-
graphql-parser = "^0.4.0"
14+
graphql-parser = { version = "0.5.0", package = "graphql-parser-hive-fork" }
1515
lazy_static = "1.4.0"
1616
serde = { version = "1.0", features = ["derive"] }
1717
serde_json = "1.0"
1818
serde_with = "2.2.0"
1919

2020
[dev-dependencies]
21-
graphql-parser = "0.4.0"
21+
graphql-parser = { version = "0.5.0", package = "graphql-parser-hive-fork" }

src/validation/rules/no_unused_fragments.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@ impl<'a> OperationVisitor<'a, ValidationErrorContext> for NoUnusedFragments<'a>
3535
.iter()
3636
.filter_map(|(fragment_name, _fragment)| {
3737
if !self.fragments_in_use.contains(&fragment_name) {
38-
Some(fragment_name.clone())
38+
Some(fragment_name)
3939
} else {
4040
None
4141
}
4242
})
4343
.for_each(|unused_fragment_name| {
44-
user_context.report_error(ValidationError {error_code: self.error_code(),
44+
user_context.report_error(ValidationError {
45+
error_code: self.error_code(),
4546
locations: vec![],
4647
message: format!("Fragment \"{}\" is never used.", unused_fragment_name),
4748
});

src/validation/rules/overlapping_fields_can_be_merged.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ impl<'a> OverlappingFieldsCanBeMerged<'a> {
779779
let out_field_name = field.alias.as_ref().unwrap_or(field_name).as_str();
780780

781781
if !ast_and_defs.contains_key(out_field_name) {
782-
ast_and_defs.insert(out_field_name.clone(), Vec::new());
782+
ast_and_defs.insert(out_field_name, Vec::new());
783783
}
784784

785785
ast_and_defs
@@ -852,7 +852,8 @@ impl<'a> OperationVisitor<'a, ValidationErrorContext> for OverlappingFieldsCanBe
852852
for Conflict(ConflictReason(reason_name, reason_msg), mut p1, p2) in found_conflicts {
853853
p1.extend(p2);
854854

855-
user_context.report_error(ValidationError {error_code: self.error_code(),
855+
user_context.report_error(ValidationError {
856+
error_code: self.error_code(),
856857
message: error_message(&reason_name, &reason_msg),
857858
locations: p1,
858859
});

src/validation/rules/unique_fragment_names.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl<'a> UniqueFragmentNames<'a> {
3636

3737
fn store_finding(&mut self, name: &'a str) {
3838
let value = *self.findings_counter.entry(name).or_insert(0);
39-
self.findings_counter.insert(name.clone(), value + 1);
39+
self.findings_counter.insert(name, value + 1);
4040
}
4141
}
4242

@@ -58,7 +58,8 @@ impl<'u> ValidationRule for UniqueFragmentNames<'u> {
5858
.into_iter()
5959
.filter(|(_key, value)| *value > 1)
6060
.for_each(|(key, _value)| {
61-
error_collector.report_error(ValidationError {error_code: self.error_code(),
61+
error_collector.report_error(ValidationError {
62+
error_code: self.error_code(),
6263
message: format!("There can be only one fragment named \"{}\".", key),
6364
locations: vec![],
6465
})

src/validation/rules/unique_operation_names.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ impl<'a> UniqueOperationNames<'a> {
3535
}
3636

3737
fn store_finding(&mut self, name: &'a str) {
38-
let value = *self.findings_counter.entry(name.clone()).or_insert(0);
39-
self.findings_counter.insert(name.clone(), value + 1);
38+
let value = *self.findings_counter.entry(name).or_insert(0);
39+
self.findings_counter.insert(name, value + 1);
4040
}
4141
}
4242

@@ -58,7 +58,8 @@ impl<'u> ValidationRule for UniqueOperationNames<'u> {
5858
.into_iter()
5959
.filter(|(_key, value)| *value > 1)
6060
.for_each(|(key, _value)| {
61-
error_collector.report_error(ValidationError {error_code: self.error_code(),
61+
error_collector.report_error(ValidationError {
62+
error_code: self.error_code(),
6263
message: format!("There can be only one operation named \"{}\".", key),
6364
locations: vec![],
6465
})

0 commit comments

Comments
 (0)