Skip to content

Commit 4cda23c

Browse files
tyranrontyranron
committed
Satisfy latest nightly rustc linter
- refactor local declarative macro calling in unit tests of `juniper` crate
1 parent b282c50 commit 4cda23c

File tree

31 files changed

+1018
-1006
lines changed

31 files changed

+1018
-1006
lines changed

‎juniper/src/ast.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -819,37 +819,37 @@ impl<'a, S> VariableDefinitions<'a, S> {
819819

820820
#[cfg(test)]
821821
mod spec_input_value_fmt {
822-
use crate::graphql_input_value;
822+
use crate::graphql;
823823

824824
use super::InputValue;
825825

826826
#[test]
827827
fn correct() {
828-
let value: InputValue = graphql_input_value!(null);
828+
let value: InputValue = graphql::input_value!(null);
829829
assert_eq!(value.to_string(), "null");
830830

831-
let value: InputValue = graphql_input_value!(123);
831+
let value: InputValue = graphql::input_value!(123);
832832
assert_eq!(value.to_string(), "123");
833833

834-
let value: InputValue = graphql_input_value!(12.3);
834+
let value: InputValue = graphql::input_value!(12.3);
835835
assert_eq!(value.to_string(), "12.3");
836836

837-
let value: InputValue = graphql_input_value!("FOO");
837+
let value: InputValue = graphql::input_value!("FOO");
838838
assert_eq!(value.to_string(), "\"FOO\"");
839839

840-
let value: InputValue = graphql_input_value!(true);
840+
let value: InputValue = graphql::input_value!(true);
841841
assert_eq!(value.to_string(), "true");
842842

843-
let value: InputValue = graphql_input_value!(BAR);
843+
let value: InputValue = graphql::input_value!(BAR);
844844
assert_eq!(value.to_string(), "BAR");
845845

846-
let value: InputValue = graphql_input_value!(@baz);
846+
let value: InputValue = graphql::input_value!(@baz);
847847
assert_eq!(value.to_string(), "$baz");
848848

849-
let value: InputValue = graphql_input_value!([1, 2]);
849+
let value: InputValue = graphql::input_value!([1, 2]);
850850
assert_eq!(value.to_string(), "[1, 2]");
851851

852-
let value: InputValue = graphql_input_value!({"foo": 1,"bar": 2});
852+
let value: InputValue = graphql::input_value!({"foo": 1,"bar": 2});
853853
assert_eq!(value.to_string(), "{foo: 1, bar: 2}");
854854
}
855855
}

‎juniper/src/executor/look_ahead.rs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ mod tests {
810810

811811
use crate::{
812812
ast::{Document, OwnedDocument},
813-
graphql_vars,
813+
graphql,
814814
parser::UnlocatedParseResult,
815815
schema::model::SchemaType,
816816
validation::test_harness::{MutationRoot, QueryRoot, SubscriptionRoot},
@@ -941,7 +941,7 @@ mod tests {
941941
let fragments = extract_fragments(&docs);
942942

943943
if let crate::ast::Definition::Operation(ref op) = docs[0] {
944-
let vars = graphql_vars! {};
944+
let vars = graphql::vars! {};
945945
let look_ahead = selection_look_ahead(&op.item.selection_set[0], &vars, &fragments);
946946

947947
let expected = LookAheadDebug {
@@ -993,7 +993,7 @@ mod tests {
993993
let fragments = extract_fragments(&docs);
994994

995995
if let crate::ast::Definition::Operation(ref op) = docs[0] {
996-
let vars = graphql_vars! {};
996+
let vars = graphql::vars! {};
997997
let look_ahead = selection_look_ahead(&op.item.selection_set[0], &vars, &fragments);
998998

999999
let expected = LookAheadDebug {
@@ -1063,7 +1063,7 @@ mod tests {
10631063
let fragments = extract_fragments(&docs);
10641064

10651065
if let crate::ast::Definition::Operation(ref op) = docs[0] {
1066-
let vars = graphql_vars! {};
1066+
let vars = graphql::vars! {};
10671067
let look_ahead = selection_look_ahead(&op.item.selection_set[0], &vars, &fragments);
10681068

10691069
let expected = LookAheadDebug {
@@ -1114,7 +1114,7 @@ mod tests {
11141114
let fragments = extract_fragments(&docs);
11151115

11161116
if let crate::ast::Definition::Operation(ref op) = docs[0] {
1117-
let vars = graphql_vars! {"episode": JEDI};
1117+
let vars = graphql::vars! {"episode": JEDI};
11181118
let look_ahead = selection_look_ahead(&op.item.selection_set[0], &vars, &fragments);
11191119

11201120
let expected = LookAheadDebug {
@@ -1161,7 +1161,7 @@ mod tests {
11611161
let fragments = extract_fragments(&docs);
11621162

11631163
if let crate::ast::Definition::Operation(ref op) = docs[0] {
1164-
let vars = graphql_vars! {};
1164+
let vars = graphql::vars! {};
11651165
let look_ahead = selection_look_ahead(&op.item.selection_set[0], &vars, &fragments);
11661166

11671167
let expected = LookAheadDebug {
@@ -1204,7 +1204,7 @@ mod tests {
12041204
let fragments = extract_fragments(&docs);
12051205

12061206
if let crate::ast::Definition::Operation(ref op) = docs[0] {
1207-
let vars = graphql_vars! {};
1207+
let vars = graphql::vars! {};
12081208
let look_ahead = selection_look_ahead(&op.item.selection_set[0], &vars, &fragments);
12091209

12101210
let expected = LookAheadDebug {
@@ -1261,7 +1261,7 @@ mod tests {
12611261
let fragments = extract_fragments(&docs);
12621262

12631263
if let crate::ast::Definition::Operation(ref op) = docs[0] {
1264-
let vars = graphql_vars! {};
1264+
let vars = graphql::vars! {};
12651265
let look_ahead = selection_look_ahead(&op.item.selection_set[0], &vars, &fragments);
12661266

12671267
let expected = LookAheadDebug {
@@ -1314,7 +1314,7 @@ mod tests {
13141314
let fragments = extract_fragments(&docs);
13151315

13161316
if let crate::ast::Definition::Operation(ref op) = docs[0] {
1317-
let vars = graphql_vars! {};
1317+
let vars = graphql::vars! {};
13181318
let look_ahead = selection_look_ahead(&op.item.selection_set[0], &vars, &fragments);
13191319

13201320
let expected = LookAheadDebug {
@@ -1371,7 +1371,7 @@ mod tests {
13711371
let fragments = extract_fragments(&docs);
13721372

13731373
if let crate::ast::Definition::Operation(ref op) = docs[0] {
1374-
let vars = graphql_vars! {};
1374+
let vars = graphql::vars! {};
13751375
let look_ahead = selection_look_ahead(&op.item.selection_set[0], &vars, &fragments);
13761376

13771377
let expected = LookAheadDebug {
@@ -1439,7 +1439,7 @@ mod tests {
14391439
let fragments = extract_fragments(&docs);
14401440

14411441
if let crate::ast::Definition::Operation(ref op) = docs[0] {
1442-
let vars = graphql_vars! {
1442+
let vars = graphql::vars! {
14431443
"id": 42,
14441444
"withFriends": true,
14451445
};
@@ -1569,7 +1569,7 @@ mod tests {
15691569
let fragments = extract_fragments(&docs);
15701570

15711571
if let crate::ast::Definition::Operation(ref op) = docs[0] {
1572-
let vars = graphql_vars! {};
1572+
let vars = graphql::vars! {};
15731573
let look_ahead = selection_look_ahead(&op.item.selection_set[0], &vars, &fragments);
15741574

15751575
let expected = LookAheadDebug {
@@ -1623,7 +1623,7 @@ mod tests {
16231623
let fragments = extract_fragments(&docs);
16241624

16251625
if let crate::ast::Definition::Operation(ref op) = docs[0] {
1626-
let vars = graphql_vars! {};
1626+
let vars = graphql::vars! {};
16271627
let look_ahead = selection_look_ahead(&op.item.selection_set[0], &vars, &fragments);
16281628

16291629
let id = look_ahead.children().select("id").unwrap();
@@ -1694,7 +1694,7 @@ mod tests {
16941694
let fragments = extract_fragments(&docs);
16951695

16961696
if let crate::ast::Definition::Operation(ref op) = docs[0] {
1697-
let vars = graphql_vars! {};
1697+
let vars = graphql::vars! {};
16981698
let look_ahead = selection_look_ahead(&op.item.selection_set[0], &vars, &fragments);
16991699

17001700
let expected = LookAheadDebug {
@@ -1742,7 +1742,7 @@ mod tests {
17421742
let fragments = extract_fragments(&docs);
17431743

17441744
if let crate::ast::Definition::Operation(ref op) = docs[0] {
1745-
let vars = graphql_vars! {};
1745+
let vars = graphql::vars! {};
17461746
let look_ahead = selection_look_ahead(&op.item.selection_set[0], &vars, &fragments);
17471747

17481748
assert_eq!(look_ahead.field_original_name(), "hero");
@@ -1842,7 +1842,7 @@ mod tests {
18421842
let fragments = extract_fragments(&docs);
18431843

18441844
if let crate::ast::Definition::Operation(ref op) = docs[0] {
1845-
let vars = graphql_vars! {};
1845+
let vars = graphql::vars! {};
18461846
let look_ahead = selection_look_ahead(&op.item.selection_set[0], &vars, &fragments);
18471847

18481848
let mut children = look_ahead.children_for_explicit_type("Human").into_iter();

‎juniper/src/executor_tests/async_await/mod.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use crate::{
2-
EmptyMutation, EmptySubscription, GraphQLEnum, RootNode, Value, graphql_object, graphql_value,
3-
graphql_vars,
2+
EmptyMutation, EmptySubscription, GraphQLEnum, RootNode, Value, graphql, graphql_object,
43
};
54

65
#[derive(GraphQLEnum)]
@@ -86,7 +85,7 @@ async fn async_simple() {
8685
}
8786
"#;
8887

89-
let (res, errs) = crate::execute(doc, None, &schema, &graphql_vars! {}, &())
88+
let (res, errs) = crate::execute(doc, None, &schema, &graphql::vars! {}, &())
9089
.await
9190
.unwrap();
9291

@@ -97,7 +96,7 @@ async fn async_simple() {
9796

9897
assert_eq!(
9998
value,
100-
graphql_value!({
99+
graphql::value!({
101100
"delayed": true,
102101
"fieldAsyncPlain": "field_async_plain",
103102
"fieldSync": "field_sync",

0 commit comments

Comments
 (0)