Skip to content

Commit 17a02fa

Browse files
tyranrontyranron
committed
Correct fully qualified paths in generated code (#1195, #1194)
1 parent 801820a commit 17a02fa

File tree

15 files changed

+120
-60
lines changed

15 files changed

+120
-60
lines changed

‎juniper/src/macros/reflect.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ macro_rules! assert_implemented_for {
516516
<$implementor as $crate::macros::reflect::BaseType<$scalar>>::NAME,
517517
"`: missing implementer reference in interface's `for` attribute.",
518518
);
519-
::std::panic!("{}", MSG);
519+
::core::panic!("{}", MSG);
520520
}
521521
})*
522522
};
@@ -544,7 +544,7 @@ macro_rules! assert_interfaces_impls {
544544
<$implementers as $crate::macros::reflect::BaseType<$scalar>>::NAME,
545545
"`: missing interface reference in implementer's `impl` attribute.",
546546
);
547-
::std::panic!("{}", MSG);
547+
::core::panic!("{}", MSG);
548548
}
549549
})*
550550
};
@@ -576,7 +576,7 @@ macro_rules! assert_transitive_impls {
576576
<$implementor as $crate::macros::reflect::BaseType<$scalar>>::NAME,
577577
"`."
578578
);
579-
::std::panic!("{}", MSG);
579+
::core::panic!("{}", MSG);
580580
}
581581
})*
582582
};
@@ -674,7 +674,7 @@ macro_rules! assert_subtype {
674674
$crate::format_type!(BASE_RETURN_TY, BASE_RETURN_WRAPPED_VAL),
675675
"`.",
676676
);
677-
::std::panic!("{}", MSG);
677+
::core::panic!("{}", MSG);
678678
}
679679
};
680680
};
@@ -855,7 +855,7 @@ macro_rules! assert_field_args {
855855
};
856856
const ERROR_MSG: &str =
857857
$crate::const_concat!(ERR_PREFIX, "Field `", FIELD_NAME, "`: ", MSG);
858-
::std::panic!("{}", ERROR_MSG);
858+
::core::panic!("{}", ERROR_MSG);
859859
}
860860
};
861861
};
@@ -911,7 +911,7 @@ macro_rules! checked_hash {
911911
<$impl_ty as $crate::macros::reflect::BaseType<$scalar>>::NAME,
912912
"`."
913913
);
914-
::std::panic!("{}", MSG)
914+
::core::panic!("{}", MSG)
915915
}
916916
}};
917917
}

‎juniper_codegen/src/common/deprecation.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ impl Directive {
102102

103103
impl ToTokens for Directive {
104104
fn to_tokens(&self, into: &mut TokenStream) {
105-
let reason = self.reason.as_ref().map_or_else(
106-
|| quote! { ::core::option::Option::None },
107-
|text| quote! { ::core::option::Option::Some(#text) },
108-
);
105+
let reason = self
106+
.reason
107+
.as_ref()
108+
.map_or_else(|| quote! { None }, |text| quote! { Some(#text) });
109109
quote! {
110-
.deprecated(#reason)
110+
.deprecated(::core::option::Option::#reason)
111111
}
112112
.to_tokens(into);
113113
}

‎juniper_codegen/src/common/field/arg.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,9 @@ impl OnMethod {
341341
quote! {
342342
match #arg {
343343
::core::result::Result::Ok(v) => v,
344-
::core::result::Result::Err(e) => return ::std::boxed::Box::pin(async { ::core::result::Result::Err(e) }),
344+
::core::result::Result::Err(e) => return ::std::boxed::Box::pin(async {
345+
::core::result::Result::Err(e)
346+
}),
345347
}
346348
}
347349
} else {

‎juniper_codegen/src/common/field/mod.rs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,14 +354,20 @@ impl Definition {
354354
async move {
355355
let ex = executor.as_executor();
356356
match res2 {
357-
::core::result::Result::Ok(::core::option::Option::Some((ctx, r))) => {
357+
::core::result::Result::Ok(
358+
::core::option::Option::Some((ctx, r)),
359+
) => {
358360
let sub = ex.replaced_context(ctx);
359361
sub.resolve_with_ctx_async(&(), &r)
360362
.await
361363
.map_err(|e| ex.new_error(e))
362364
}
363-
::core::result::Result::Ok(::core::option::Option::None) => ::core::result::Result::Ok(::juniper::Value::null()),
364-
::core::result::Result::Err(e) => ::core::result::Result::Err(ex.new_error(e)),
365+
::core::result::Result::Ok(::core::option::Option::None) => {
366+
::core::result::Result::Ok(::juniper::Value::null())
367+
}
368+
::core::result::Result::Err(e) => {
369+
::core::result::Result::Err(ex.new_error(e))
370+
}
365371
}
366372
}
367373
});

‎juniper_codegen/src/common/gen.rs‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@ pub(crate) fn sync_resolving_code() -> TokenStream {
1313
quote! {
1414
::juniper::IntoResolvable::into_resolvable(res, executor.context())
1515
.and_then(|res| match res {
16-
::core::option::Option::Some((ctx, r)) => executor.replaced_context(ctx).resolve_with_ctx(info, &r),
17-
::core::option::Option::None => ::core::result::Result::Ok(::juniper::Value::null()),
16+
::core::option::Option::Some((ctx, r)) => {
17+
executor.replaced_context(ctx).resolve_with_ctx(info, &r)
18+
}
19+
::core::option::Option::None => {
20+
::core::result::Result::Ok(::juniper::Value::null())
21+
}
1822
})
1923
}
2024
}
@@ -39,8 +43,10 @@ pub(crate) fn async_resolving_code(ty: Option<&syn::Type>) -> TokenStream {
3943
::core::option::Option::Some((ctx, r)) => {
4044
let subexec = executor.replaced_context(ctx);
4145
subexec.resolve_with_ctx_async(info, &r).await
42-
},
43-
::core::option::Option::None => ::core::result::Result::Ok(::juniper::Value::null()),
46+
}
47+
::core::option::Option::None => {
48+
::core::result::Result::Ok(::juniper::Value::null())
49+
}
4450
}
4551
}))
4652
}

‎juniper_codegen/src/graphql_enum/mod.rs‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,9 @@ impl Definition {
450450
for #ident #ty_generics
451451
#where_clause
452452
{
453-
fn name(_ : &Self::TypeInfo) -> ::core::option::Option<&'static ::core::primitive::str> {
453+
fn name(
454+
_ : &Self::TypeInfo,
455+
) -> ::core::option::Option<&'static ::core::primitive::str> {
454456
::core::option::Option::Some(#name)
455457
}
456458

@@ -489,7 +491,9 @@ impl Definition {
489491
let name = &v.name;
490492

491493
quote! {
492-
Self::#ident => ::core::result::Result::Ok(::juniper::Value::scalar(::std::string::String::from(#name))),
494+
Self::#ident => ::core::result::Result::Ok(::juniper::Value::scalar(
495+
::std::string::String::from(#name),
496+
)),
493497
}
494498
});
495499

@@ -509,7 +513,10 @@ impl Definition {
509513
type Context = #context;
510514
type TypeInfo = ();
511515

512-
fn type_name<'__i>(&self, info: &'__i Self::TypeInfo) -> ::core::option::Option<&'__i ::core::primitive::str> {
516+
fn type_name<'__i>(
517+
&self,
518+
info: &'__i Self::TypeInfo,
519+
) -> ::core::option::Option<&'__i ::core::primitive::str> {
513520
<Self as ::juniper::GraphQLType<#scalar>>::name(info)
514521
}
515522

@@ -588,10 +595,14 @@ impl Definition {
588595
{
589596
type Error = ::std::string::String;
590597

591-
fn from_input_value(v: &::juniper::InputValue<#scalar>) -> ::core::result::Result<Self, Self::Error> {
598+
fn from_input_value(
599+
v: &::juniper::InputValue<#scalar>,
600+
) -> ::core::result::Result<Self, Self::Error> {
592601
match v.as_enum_value().or_else(|| v.as_string_value()) {
593602
#( #variants )*
594-
_ => ::core::result::Result::Err(::std::format!("Unknown enum value: {}", v)),
603+
_ => ::core::result::Result::Err(
604+
::std::format!("Unknown enum value: {}", v),
605+
),
595606
}
596607
}
597608
}

‎juniper_codegen/src/graphql_input_object/mod.rs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,9 @@ impl Definition {
479479
for #ident #ty_generics
480480
#where_clause
481481
{
482-
fn name(_: &Self::TypeInfo) -> ::core::option::Option<&'static ::core::primitive::str> {
482+
fn name(
483+
_: &Self::TypeInfo,
484+
) -> ::core::option::Option<&'static ::core::primitive::str> {
483485
::core::option::Option::Some(#name)
484486
}
485487

@@ -524,7 +526,10 @@ impl Definition {
524526
type Context = #context;
525527
type TypeInfo = ();
526528

527-
fn type_name<'__i>(&self, info: &'__i Self::TypeInfo) -> ::core::option::Option<&'__i ::core::primitive::str> {
529+
fn type_name<'__i>(
530+
&self,
531+
info: &'__i Self::TypeInfo,
532+
) -> ::core::option::Option<&'__i ::core::primitive::str> {
528533
<Self as ::juniper::GraphQLType<#scalar>>::name(info)
529534
}
530535
}

‎juniper_codegen/src/graphql_interface/mod.rs‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,9 @@ impl Definition {
460460
syn::GenericParam::Const(_) => return None,
461461
};
462462
Some(quote! {
463-
::core::marker::PhantomData<::std::sync::atomic::AtomicPtr<std::boxed::Box<#ty>>>
463+
::core::marker::PhantomData<
464+
::core::sync::atomic::AtomicPtr<std::boxed::Box<#ty>>
465+
>
464466
})
465467
});
466468
quote! { __Phantom(#(#phantom_params),*) }
@@ -474,7 +476,7 @@ impl Definition {
474476
.map(|(ty, ident)| {
475477
quote! {
476478
#[automatically_derived]
477-
impl #interface_impl_gens ::std::convert::From<#ty>
479+
impl #interface_impl_gens ::core::convert::From<#ty>
478480
for #alias_ident #interface_ty_gens
479481
#interface_where_clause
480482
{
@@ -487,7 +489,7 @@ impl Definition {
487489

488490
quote! {
489491
#[automatically_derived]
490-
#[derive(::std::clone::Clone, ::core::marker::Copy, ::std::fmt::Debug)]
492+
#[derive(::core::clone::Clone, ::core::marker::Copy, ::core::fmt::Debug)]
491493
#[doc = #enum_doc]
492494
#vis enum #enum_ident #enum_gens {
493495
#( #[doc(hidden)] #variants_idents(#variant_gens_pars), )*
@@ -715,8 +717,10 @@ impl Definition {
715717
for #ty #ty_generics
716718
#where_clause
717719
{
718-
fn name(_ : &Self::TypeInfo) -> ::core::option::Option<&'static ::core::primitive::str> {
719-
::std::option::Option::Some(#name)
720+
fn name(
721+
_ : &Self::TypeInfo,
722+
) -> ::core::option::Option<&'static ::core::primitive::str> {
723+
::core::option::Option::Some(#name)
720724
}
721725

722726
fn meta<'r>(
@@ -784,7 +788,10 @@ impl Definition {
784788
type Context = #context;
785789
type TypeInfo = ();
786790

787-
fn type_name<'__i>(&self, info: &'__i Self::TypeInfo) -> std::option::Option<&'__i ::core::primitive::str> {
791+
fn type_name<'__i>(
792+
&self,
793+
info: &'__i Self::TypeInfo,
794+
) -> ::core::option::Option<&'__i ::core::primitive::str> {
788795
<Self as ::juniper::GraphQLType<#scalar>>::name(info)
789796
}
790797

‎juniper_codegen/src/graphql_object/mod.rs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,9 @@ impl<Operation: ?Sized + 'static> Definition<Operation> {
457457
#[automatically_derived]
458458
impl #impl_generics ::juniper::GraphQLType<#scalar> for #ty #where_clause
459459
{
460-
fn name(_ : &Self::TypeInfo) -> ::core::option::Option<&'static ::core::primitive::str> {
460+
fn name(
461+
_ : &Self::TypeInfo,
462+
) -> ::core::option::Option<&'static ::core::primitive::str> {
461463
::core::option::Option::Some(#name)
462464
}
463465

@@ -626,7 +628,7 @@ impl Definition<Query> {
626628

627629
let resolve = if field.is_async {
628630
quote! {
629-
::std::panic!(
631+
::core::panic!(
630632
"Tried to resolve async field `{}` on type `{}` with a sync resolver",
631633
#name,
632634
<Self as ::juniper::macros::reflect::BaseType<#scalar>>::NAME,
@@ -783,7 +785,10 @@ impl Definition<Query> {
783785
type Context = #context;
784786
type TypeInfo = ();
785787

786-
fn type_name<'__i>(&self, info: &'__i Self::TypeInfo) -> ::core::option::Option<&'__i ::core::primitive::str> {
788+
fn type_name<'__i>(
789+
&self,
790+
info: &'__i Self::TypeInfo,
791+
) -> ::core::option::Option<&'__i ::core::primitive::str> {
787792
<Self as ::juniper::GraphQLType<#scalar>>::name(info)
788793
}
789794

‎juniper_codegen/src/graphql_scalar/mod.rs‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,9 @@ impl Definition {
375375
impl #impl_gens ::juniper::GraphQLType<#scalar> for #ty
376376
#where_clause
377377
{
378-
fn name(_: &Self::TypeInfo) -> ::core::option::Option<&'static ::core::primitive::str> {
378+
fn name(
379+
_: &Self::TypeInfo,
380+
) -> ::core::option::Option<&'static ::core::primitive::str> {
379381
::core::option::Option::Some(#name)
380382
}
381383

@@ -416,7 +418,10 @@ impl Definition {
416418
type Context = ();
417419
type TypeInfo = ();
418420

419-
fn type_name<'i>(&self, info: &'i Self::TypeInfo) -> ::core::option::Option<&'i ::core::primitive::str> {
421+
fn type_name<'i>(
422+
&self,
423+
info: &'i Self::TypeInfo,
424+
) -> ::core::option::Option<&'i ::core::primitive::str> {
420425
<Self as ::juniper::GraphQLType<#scalar>>::name(info)
421426
}
422427

@@ -454,9 +459,8 @@ impl Definition {
454459
selection_set: ::core::option::Option<&'b [::juniper::Selection<'_, #scalar>]>,
455460
executor: &'b ::juniper::Executor<'_, '_, Self::Context, #scalar>,
456461
) -> ::juniper::BoxFuture<'b, ::juniper::ExecutionResult<#scalar>> {
457-
use ::juniper::futures::future;
458462
let v = ::juniper::GraphQLValue::resolve(self, info, selection_set, executor);
459-
::std::boxed::Box::pin(future::ready(v))
463+
::std::boxed::Box::pin(::juniper::futures::future::ready(v))
460464
}
461465
}
462466
}
@@ -507,7 +511,9 @@ impl Definition {
507511
{
508512
type Error = ::juniper::executor::FieldError<#scalar>;
509513

510-
fn from_input_value(input: &::juniper::InputValue<#scalar>) -> ::core::result::Result<Self, Self::Error> {
514+
fn from_input_value(
515+
input: &::juniper::InputValue<#scalar>,
516+
) -> ::core::result::Result<Self, Self::Error> {
511517
#from_input_value
512518
.map_err(::juniper::executor::IntoFieldError::<#scalar>::into_field_error)
513519
}

0 commit comments

Comments
 (0)