Modifiers -> Qualifiers

rust-lang · Feb 13, 2021 · be4ea06 · be4ea06
1 parent ffa5280
commit be4ea06
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git 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<Modifiers> {
+crate fn from_fn_header(header: &rustc_hir::FnHeader) -> HashSet<Qualifiers> {
     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<clean::BareFunctionDecl> 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
@@ -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,15 +294,15 @@ pub enum Modifiers {
 pub struct Function {
     pub decl: FnDecl,
     pub generics: Generics,
-    pub header: HashSet<Modifiers>,
+    pub header: HashSet<Qualifiers>,
     pub abi: String,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub struct Method {
     pub decl: FnDecl,
     pub generics: Generics,
-    pub header: HashSet<Modifiers>,
+    pub header: HashSet<Qualifiers>,
     pub abi: String,
     pub has_body: bool,
 }
@@ -415,7 +415,7 @@ pub enum Type {
 pub struct FunctionPointer {
     pub decl: FnDecl,
     pub generic_params: Vec<GenericParamDef>,
-    pub header: HashSet<Modifiers>,
+    pub header: HashSet<Qualifiers>,
     pub abi: String,
 }