move serde impls to separate module

Author: yotamofek

src/librustdoc/html/render/mod.rs

@@ -61,8 +61,6 @@ use rustc_middle::ty::print::PrintTraitRefExt;
 use rustc_middle::ty::{self,TyCtxt};
 use rustc_span::symbol::{Symbol, sym};
 use rustc_span::{BytePos,DUMMY_SP,FileName,RealFileName};
-use serde::ser::SerializeSeqas _;
-use serde::{Deserialize,Deserializer,Serialize,Serializer};
 use tracing::{debug, info};
 
 pub(crate)useself::context::*;
@@ -425,102 +423,6 @@ impl IndexItemFunctionType {
 }
 }
 
-implSerializeforIndexItemFunctionType{
-fnserialize<S>(&self,serializer:S) -> Result<S::Ok,S::Error>
-where
-S:Serializer,
-{
-structParamNames<'a>(&'a[Option<Symbol>]);
-
-impl<'a>SerializeforParamNames<'a>{
-fnserialize<S>(&self,serializer:S) -> Result<S::Ok,S::Error>
-where
-S:Serializer,
-{
- serializer.collect_seq(
-self.0
-.iter()
-.map(|symbol| symbol.as_ref().map(Symbol::as_str).unwrap_or_default()),
-)
-}
-}
-
-letmut seq = serializer.serialize_seq(Some(2))?;
-
-letmut fn_type = String::new();
-self.write_to_string_without_param_names(&mut fn_type);
- seq.serialize_element(&fn_type)?;
-
- seq.serialize_element(&ParamNames(&self.param_names))?;
-
- seq.end()
-}
-}
-
-impl<'de>Deserialize<'de>forIndexItemFunctionType{
-fndeserialize<D>(deserializer:D) -> Result<Self,D::Error>
-where
-D:Deserializer<'de>,
-{
-use serde::de::{self,SeqAccess};
-
-#[derive(Deserialize)]
-structDeserialized{
-#[serde(deserialize_with = "function_signature")]
-function_signature:IndexItemFunctionType,
-#[serde(deserialize_with = "param_names")]
-param_names:Vec<Option<Symbol>>,
-}
-
-fnfunction_signature<'de,D:Deserializer<'de>>(
-deserializer:D,
-) -> Result<IndexItemFunctionType,D::Error>{
-String::deserialize(deserializer).map(|sig| {
-IndexItemFunctionType::read_from_string_without_param_names(sig.as_bytes()).0
-})
-}
-
-fnparam_names<'de,D:Deserializer<'de>>(
-deserializer:D,
-) -> Result<Vec<Option<Symbol>>,D::Error>{
-structVisitor;
-
-impl<'de> de::Visitor<'de>forVisitor{
-typeValue = Vec<Option<Symbol>>;
-
-fnexpecting(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
- f.write_str("seq of param names")
-}
-
-fnvisit_seq<A>(self,mutseq:A) -> Result<Self::Value,A::Error>
-where
-A:SeqAccess<'de>,
-{
-letmut param_names = Vec::with_capacity(seq.size_hint().unwrap_or_default());
-
-whileletSome(symbol) = seq.next_element::<String>()? {
- param_names.push(if symbol.is_empty(){
-None
-}else{
-Some(Symbol::intern(&symbol))
-});
-}
-
-Ok(param_names)
-}
-}
-
- deserializer.deserialize_seq(Visitor)
-}
-
-letDeserialized{mut function_signature, param_names } =
-Deserialized::deserialize(deserializer)?;
- function_signature.param_names = param_names;
-
-Ok(function_signature)
-}
-}
-
 #[derive(Debug,Clone)]
 pub(crate)structStylePath{
 /// The path to the theme

src/librustdoc/html/render/search_index.rs

@@ -1,9 +1,13 @@
 pub(crate)mod encode;
+mod serde;
 
 use std::collections::BTreeSet;
 use std::collections::hash_map::Entry;
 use std::path::Path;
 
+use::serde::de::{self,Deserializer,Erroras _};
+use::serde::ser::{SerializeSeq,Serializer};
+use::serde::{Deserialize,Serialize};
 use rustc_ast::join_path_syms;
 use rustc_data_structures::fx::{FxHashMap,FxHashSet,FxIndexMap};
 use rustc_hir::attrs::AttributeKind;
@@ -12,9 +16,6 @@ use rustc_middle::ty::TyCtxt;
 use rustc_span::def_id::DefId;
 use rustc_span::sym;
 use rustc_span::symbol::{Symbol, kw};
-use serde::de::{self,Deserializer,Erroras _};
-use serde::ser::{SerializeSeq,Serializer};
-use serde::{Deserialize,Serialize};
 use stringdex::internals as stringdex_internals;
 use thin_vec::ThinVec;
 use tracing::instrument;

src/librustdoc/html/render/search_index/serde.rs

@@ -0,0 +1,102 @@
+use std::fmt::{self,Formatter};
+
+use rustc_span::Symbol;
+use serde::de::{self,SeqAccess};
+use serde::ser::SerializeSeqas _;
+use serde::{Deserialize,Deserializer,Serialize,Serializer};
+
+usecrate::html::render::IndexItemFunctionType;
+
+implSerializeforIndexItemFunctionType{
+fnserialize<S>(&self,serializer:S) -> Result<S::Ok,S::Error>
+where
+S:Serializer,
+{
+structParamNames<'a>(&'a[Option<Symbol>]);
+
+impl<'a>SerializeforParamNames<'a>{
+fnserialize<S>(&self,serializer:S) -> Result<S::Ok,S::Error>
+where
+S:Serializer,
+{
+ serializer.collect_seq(
+self.0
+.iter()
+.map(|symbol| symbol.as_ref().map(Symbol::as_str).unwrap_or_default()),
+)
+}
+}
+
+letmut seq = serializer.serialize_seq(Some(2))?;
+
+letmut fn_type = String::new();
+self.write_to_string_without_param_names(&mut fn_type);
+ seq.serialize_element(&fn_type)?;
+
+ seq.serialize_element(&ParamNames(&self.param_names))?;
+
+ seq.end()
+}
+}
+
+impl<'de>Deserialize<'de>forIndexItemFunctionType{
+fndeserialize<D>(deserializer:D) -> Result<Self,D::Error>
+where
+D:Deserializer<'de>,
+{
+#[derive(Deserialize)]
+structDeserialized{
+#[serde(deserialize_with = "function_signature")]
+function_signature:IndexItemFunctionType,
+#[serde(deserialize_with = "param_names")]
+param_names:Vec<Option<Symbol>>,
+}
+
+fnfunction_signature<'de,D:Deserializer<'de>>(
+deserializer:D,
+) -> Result<IndexItemFunctionType,D::Error>{
+String::deserialize(deserializer).map(|sig| {
+IndexItemFunctionType::read_from_string_without_param_names(sig.as_bytes()).0
+})
+}
+
+fnparam_names<'de,D:Deserializer<'de>>(
+deserializer:D,
+) -> Result<Vec<Option<Symbol>>,D::Error>{
+structVisitor;
+
+impl<'de> de::Visitor<'de>forVisitor{
+typeValue = Vec<Option<Symbol>>;
+
+fnexpecting(&self,f:&mutFormatter<'_>) -> fmt::Result{
+ f.write_str("seq of param names")
+}
+
+fnvisit_seq<A>(self,mutseq:A) -> Result<Self::Value,A::Error>
+where
+A:SeqAccess<'de>,
+{
+letmut param_names = Vec::with_capacity(seq.size_hint().unwrap_or_default());
+
+whileletSome(symbol) = seq.next_element::<String>()? {
+ param_names.push(if symbol.is_empty(){
+None
+}else{
+Some(Symbol::intern(&symbol))
+});
+}
+
+Ok(param_names)
+}
+}
+
+ deserializer.deserialize_seq(Visitor)
+}
+
+letDeserialized{mut function_signature, param_names } =
+Deserialized::deserialize(deserializer)?;
+ function_signature.param_names = param_names;
+
+Ok(function_signature)
+}
+}