yume/juniper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tune up for 1.65 Rust

Browse source
This commit is contained in:
tyranron 2022-11-04 19:04:55 +01:00
parent 819e26aba1
commit 3a68877de0
No known key found for this signature in database
GPG key ID: 762E144FB230A4F0
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
juniper/src/validation/rules/overlapping_fields_can_be_merged.rs
View file

@ -433,7 +433,7 @@ impl<'a, S: Debug> OverlappingFieldsCanBeMerged<'a, S> {
let t2 = def2.as_ref().map(|def| &def.field_type);
if let (Some(t1), Some(t2)) = (t1, t2) {
if self.is_type_conflict(ctx, t1, t2) {
if Self::is_type_conflict(ctx, t1, t2) {
return Some(Conflict(
ConflictReason(
response_name.into(),
@ -564,7 +564,7 @@ impl<'a, S: Debug> OverlappingFieldsCanBeMerged<'a, S> {
))
}
fn is_type_conflict(&self, ctx: &ValidatorContext<'a, S>, t1: &Type, t2: &Type) -> bool {
fn is_type_conflict(ctx: &ValidatorContext<'a, S>, t1: &Type, t2: &Type) -> bool {
match (t1, t2) {
(&Type::List(ref inner1, expected_size1), &Type::List(ref inner2, expected_size2))
| (
@ -574,7 +574,7 @@ impl<'a, S: Debug> OverlappingFieldsCanBeMerged<'a, S> {
if expected_size1 != expected_size2 {
return false;
}
self.is_type_conflict(ctx, inner1, inner2)
Self::is_type_conflict(ctx, inner1, inner2)
}
(&Type::NonNullNamed(ref n1), &Type::NonNullNamed(ref n2))
| (&Type::Named(ref n1), &Type::Named(ref n2)) => {
@ -655,7 +655,7 @@ impl<'a, S: Debug> OverlappingFieldsCanBeMerged<'a, S> {
let mut ast_and_defs = OrderedMap::new();
let mut fragment_names = Vec::new();
self.collect_fields_and_fragment_names(
Self::collect_fields_and_fragment_names(
parent_type,
selection_set,
ctx,
@ -667,7 +667,6 @@ impl<'a, S: Debug> OverlappingFieldsCanBeMerged<'a, S> {
}
fn collect_fields_and_fragment_names(
&self,
parent_type: Option<&'a MetaType<S>>,
selection_set: &'a [Selection<S>],
ctx: &ValidatorContext<'a, S>,
@ -709,7 +708,7 @@ impl<'a, S: Debug> OverlappingFieldsCanBeMerged<'a, S> {
.and_then(|cond| ctx.schema.concrete_type_by_name(cond.item))
.or(parent_type);
self.collect_fields_and_fragment_names(
Self::collect_fields_and_fragment_names(
parent_type,
&inline.selection_set,
ctx,

2
juniper_codegen/src/common/parse/mod.rs
View file

@ -130,7 +130,7 @@ impl TypeExt for syn::Type {
fn unreferenced(&self) -> &Self {
match self.unparenthesized() {
Self::Reference(ref_ty) => &*ref_ty.elem,
Self::Reference(ref_ty) => &ref_ty.elem,
ty => ty,
}
}