Skip to content

Commit 7b7e089

Browse files
committed
Unify access to the serde namespace
In other places `_serde` name is used to access the `serde` crate, so use it there
1 parent da3998a commit 7b7e089

File tree

3 files changed

+11
-19
lines changed

3 files changed

+11
-19
lines changed

serde_derive/src/de.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,16 @@ pub fn expand_derive_deserialize(input: &mut syn::DeriveInput) -> syn::Result<To
2727
let (de_impl_generics, _, ty_generics, where_clause) = split_with_de_lifetime(&params);
2828
let body = Stmts(deserialize_body(&cont, &params));
2929
let delife = params.borrowed.de_lifetime();
30-
let serde = cont.attrs.serde_path();
3130

3231
let impl_block = if let Some(remote) = cont.attrs.remote() {
3332
let vis = &input.vis;
3433
let used = pretend::pretend_used(&cont, params.is_packed);
3534
quote! {
3635
#[automatically_derived]
3736
impl #de_impl_generics #ident #ty_generics #where_clause {
38-
#vis fn deserialize<__D>(__deserializer: __D) -> #serde::__private::Result<#remote #ty_generics, __D::Error>
37+
#vis fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result<#remote #ty_generics, __D::Error>
3938
where
40-
__D: #serde::Deserializer<#delife>,
39+
__D: _serde::Deserializer<#delife>,
4140
{
4241
#used
4342
#body
@@ -49,10 +48,10 @@ pub fn expand_derive_deserialize(input: &mut syn::DeriveInput) -> syn::Result<To
4948

5049
quote! {
5150
#[automatically_derived]
52-
impl #de_impl_generics #serde::Deserialize<#delife> for #ident #ty_generics #where_clause {
53-
fn deserialize<__D>(__deserializer: __D) -> #serde::__private::Result<Self, __D::Error>
51+
impl #de_impl_generics _serde::Deserialize<#delife> for #ident #ty_generics #where_clause {
52+
fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result<Self, __D::Error>
5453
where
55-
__D: #serde::Deserializer<#delife>,
54+
__D: _serde::Deserializer<#delife>,
5655
{
5756
#body
5857
}

serde_derive/src/internals/attr.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ use crate::internals::symbol::*;
33
use crate::internals::{ungroup, Ctxt};
44
use proc_macro2::{Spacing, Span, TokenStream, TokenTree};
55
use quote::ToTokens;
6-
use std::borrow::Cow;
76
use std::collections::BTreeSet;
87
use std::iter::FromIterator;
98
use syn::meta::ParseNestedMeta;
109
use syn::parse::ParseStream;
1110
use syn::punctuated::Punctuated;
1211
use syn::spanned::Spanned;
13-
use syn::{parse_quote, token, Ident, Lifetime, Token};
12+
use syn::{token, Ident, Lifetime, Token};
1413

1514
// This module handles parsing of `#[serde(...)]` attributes. The entrypoints
1615
// are `attr::Container::from_ast`, `attr::Variant::from_ast`, and
@@ -609,11 +608,6 @@ impl Container {
609608
self.serde_path.as_ref()
610609
}
611610

612-
pub fn serde_path(&self) -> Cow<syn::Path> {
613-
self.custom_serde_path()
614-
.map_or_else(|| Cow::Owned(parse_quote!(_serde)), Cow::Borrowed)
615-
}
616-
617611
/// Error message generated when type can't be deserialized.
618612
/// If `None`, default message will be used
619613
pub fn expecting(&self) -> Option<&str> {

serde_derive/src/ser.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,16 @@ pub fn expand_derive_serialize(input: &mut syn::DeriveInput) -> syn::Result<Toke
2323
let params = Parameters::new(&cont);
2424
let (impl_generics, ty_generics, where_clause) = params.generics.split_for_impl();
2525
let body = Stmts(serialize_body(&cont, &params));
26-
let serde = cont.attrs.serde_path();
2726

2827
let impl_block = if let Some(remote) = cont.attrs.remote() {
2928
let vis = &input.vis;
3029
let used = pretend::pretend_used(&cont, params.is_packed);
3130
quote! {
3231
#[automatically_derived]
3332
impl #impl_generics #ident #ty_generics #where_clause {
34-
#vis fn serialize<__S>(__self: &#remote #ty_generics, __serializer: __S) -> #serde::__private::Result<__S::Ok, __S::Error>
33+
#vis fn serialize<__S>(__self: &#remote #ty_generics, __serializer: __S) -> _serde::__private::Result<__S::Ok, __S::Error>
3534
where
36-
__S: #serde::Serializer,
35+
__S: _serde::Serializer,
3736
{
3837
#used
3938
#body
@@ -43,10 +42,10 @@ pub fn expand_derive_serialize(input: &mut syn::DeriveInput) -> syn::Result<Toke
4342
} else {
4443
quote! {
4544
#[automatically_derived]
46-
impl #impl_generics #serde::Serialize for #ident #ty_generics #where_clause {
47-
fn serialize<__S>(&self, __serializer: __S) -> #serde::__private::Result<__S::Ok, __S::Error>
45+
impl #impl_generics _serde::Serialize for #ident #ty_generics #where_clause {
46+
fn serialize<__S>(&self, __serializer: __S) -> _serde::__private::Result<__S::Ok, __S::Error>
4847
where
49-
__S: #serde::Serializer,
48+
__S: _serde::Serializer,
5049
{
5150
#body
5251
}

0 commit comments

Comments
 (0)