Skip to content

Commit 106e322

Browse files
committed
Catch up codegen failure tests with latest nightly Rust
1 parent 9dfd571 commit 106e322

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

integration_tests/codegen_fail/fail/interface/implementers_duplicate_ugly.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0119]: conflicting implementations of trait `<CharacterValue as juniper::GraphQLInterface<__S>>::mark::_::{closure#0}::MutuallyExclusive` for type `ObjA`:
1+
error[E0119]: conflicting implementations of trait `<CharacterValue as juniper::GraphQLInterface<__S>>::mark::_::{closure#0}::MutuallyExclusive` for type `ObjA`
22
--> $DIR/implementers_duplicate_ugly.rs:18:1
33
|
44
18 | #[graphql_interface(for = [ObjA, ObjAlias])]
@@ -9,7 +9,7 @@ error[E0119]: conflicting implementations of trait `<CharacterValue as juniper::
99
|
1010
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
1111

12-
error[E0119]: conflicting implementations of trait `std::convert::From<ObjA>` for type `CharacterValue`:
12+
error[E0119]: conflicting implementations of trait `std::convert::From<ObjA>` for type `CharacterValue`
1313
--> $DIR/implementers_duplicate_ugly.rs:18:1
1414
|
1515
18 | #[graphql_interface(for = [ObjA, ObjAlias])]

integration_tests/codegen_fail/fail/union/enum_same_type_ugly.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0119]: conflicting implementations of trait `<Character as juniper::GraphQLUnion<__S>>::mark::_::{closure#0}::MutuallyExclusive` for type `std::string::String`:
1+
error[E0119]: conflicting implementations of trait `<Character as juniper::GraphQLUnion<__S>>::mark::_::{closure#0}::MutuallyExclusive` for type `std::string::String`
22
--> $DIR/enum_same_type_ugly.rs:3:10
33
|
44
3 | #[derive(GraphQLUnion)]

integration_tests/codegen_fail/fail/union/struct_same_type_ugly.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0119]: conflicting implementations of trait `<Character as juniper::GraphQLUnion<__S>>::mark::_::{closure#0}::MutuallyExclusive` for type `std::string::String`:
1+
error[E0119]: conflicting implementations of trait `<Character as juniper::GraphQLUnion<__S>>::mark::_::{closure#0}::MutuallyExclusive` for type `std::string::String`
22
--> $DIR/struct_same_type_ugly.rs:3:10
33
|
44
3 | #[derive(GraphQLUnion)]

integration_tests/codegen_fail/fail/union/trait_same_type_ugly.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0119]: conflicting implementations of trait `<(dyn Character + std::marker::Send + std::marker::Sync + '__obj) as juniper::GraphQLUnion<__S>>::mark::_::{closure#0}::MutuallyExclusive` for type `std::string::String`:
1+
error[E0119]: conflicting implementations of trait `<(dyn Character + std::marker::Send + std::marker::Sync + '__obj) as juniper::GraphQLUnion<__S>>::mark::_::{closure#0}::MutuallyExclusive` for type `std::string::String`
22
--> $DIR/trait_same_type_ugly.rs:3:1
33
|
44
3 | #[graphql_union]

juniper/src/schema/model.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ mod test {
579579
fn blah() -> bool {
580580
true
581581
}
582-
};
582+
}
583583
let schema = RootNode::new(
584584
Query,
585585
EmptyMutation::<()>::new(),
@@ -616,11 +616,11 @@ mod test {
616616
#[derive(GraphQLObject, Default)]
617617
struct Cake {
618618
fresh: bool,
619-
};
619+
}
620620
#[derive(GraphQLObject, Default)]
621621
struct IceCream {
622622
cold: bool,
623-
};
623+
}
624624
#[derive(GraphQLUnion)]
625625
enum GlutenFree {
626626
Cake(Cake),
@@ -671,7 +671,7 @@ mod test {
671671
fn really_old() -> f64 {
672672
42.0
673673
}
674-
};
674+
}
675675

676676
let schema = RootNode::new(
677677
Query,

0 commit comments

Comments
 (0)