diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs index 60197a0dc1c..691a7fb2a4e 100644 --- a/src/librustdoc/json/conversions.rs +++ b/src/librustdoc/json/conversions.rs @@ -228,19 +228,19 @@ crate fn from_ctor_kind(struct_type: CtorKind) -> StructType { } } -crate fn from_fn_header(header: &rustc_hir::FnHeader) -> HashSet { +crate fn from_fn_header(header: &rustc_hir::FnHeader) -> HashSet { let mut v = HashSet::new(); if let rustc_hir::Unsafety::Unsafe = header.unsafety { - v.insert(Modifiers::Unsafe); + v.insert(Qualifiers::Unsafe); } if let rustc_hir::IsAsync::Async = header.asyncness { - v.insert(Modifiers::Async); + v.insert(Qualifiers::Async); } if let rustc_hir::Constness::Const = header.constness { - v.insert(Modifiers::Const); + v.insert(Qualifiers::Const); } v @@ -376,7 +376,7 @@ impl From for FunctionPointer { FunctionPointer { header: if let rustc_hir::Unsafety::Unsafe = unsafety { let mut hs = HashSet::new(); - hs.insert(Modifiers::Unsafe); + hs.insert(Qualifiers::Unsafe); hs } else { HashSet::new() diff --git a/src/rustdoc-json-types/lib.rs b/src/rustdoc-json-types/lib.rs index a2f323699c1..eae27a4a823 100644 --- a/src/rustdoc-json-types/lib.rs +++ b/src/rustdoc-json-types/lib.rs @@ -284,7 +284,7 @@ pub enum StructType { #[non_exhaustive] #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)] #[serde(rename_all = "snake_case")] -pub enum Modifiers { +pub enum Qualifiers { Const, Unsafe, Async, @@ -294,7 +294,7 @@ pub enum Modifiers { pub struct Function { pub decl: FnDecl, pub generics: Generics, - pub header: HashSet, + pub header: HashSet, pub abi: String, } @@ -302,7 +302,7 @@ pub struct Function { pub struct Method { pub decl: FnDecl, pub generics: Generics, - pub header: HashSet, + pub header: HashSet, pub abi: String, pub has_body: bool, } @@ -415,7 +415,7 @@ pub enum Type { pub struct FunctionPointer { pub decl: FnDecl, pub generic_params: Vec, - pub header: HashSet, + pub header: HashSet, pub abi: String, }