about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRune Tynan <runetynan@gmail.com>2021-02-08 15:45:50 -0500
committerRune Tynan <runetynan@gmail.com>2021-02-08 15:45:50 -0500
commitce02b7f7a6f554dbf80b7cabc09c3d84d92d0c3a (patch)
treefc9dbf86651378b056e8de0d91c7b613eed04903
parenta26fa74d3cba37a6e1df2dffae00c522546350a3 (diff)
downloadrust-ce02b7f7a6f554dbf80b7cabc09c3d84d92d0c3a.tar.gz
rust-ce02b7f7a6f554dbf80b7cabc09c3d84d92d0c3a.zip
Add comment + move derive helper
-rw-r--r--src/rustdoc-json-types/lib.rs2
-rw-r--r--src/test/rustdoc-json/fns/header.rs2
-rw-r--r--src/test/rustdoc-json/methods/header.rs2
3 files changed, 5 insertions, 1 deletions
diff --git a/src/rustdoc-json-types/lib.rs b/src/rustdoc-json-types/lib.rs
index 790f9d62d8a..20bae0f14a2 100644
--- a/src/rustdoc-json-types/lib.rs
+++ b/src/rustdoc-json-types/lib.rs
@@ -282,8 +282,8 @@ pub enum StructType {
 }
 
 #[non_exhaustive]
-#[serde(rename_all = "snake_case")]
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+#[serde(rename_all = "snake_case")]
 pub enum Modifiers {
     Const,
     Unsafe,
diff --git a/src/test/rustdoc-json/fns/header.rs b/src/test/rustdoc-json/fns/header.rs
index fb4f89db267..29741dd50da 100644
--- a/src/test/rustdoc-json/fns/header.rs
+++ b/src/test/rustdoc-json/fns/header.rs
@@ -18,3 +18,5 @@ pub async unsafe fn async_unsafe_fn() {}
 // @has - "$.index[*][?(@.name=='const_unsafe_fn')].inner.header[*]" '"const"'
 // @has - "$.index[*][?(@.name=='const_unsafe_fn')].inner.header[*]" '"unsafe"'
 pub const unsafe fn const_unsafe_fn() {}
+
+// It's impossible for a function to be both const and async, so no test for that
diff --git a/src/test/rustdoc-json/methods/header.rs b/src/test/rustdoc-json/methods/header.rs
index 27a6ec04730..50a3db75ef3 100644
--- a/src/test/rustdoc-json/methods/header.rs
+++ b/src/test/rustdoc-json/methods/header.rs
@@ -21,4 +21,6 @@ impl Foo {
     // @has - "$.index[*][?(@.name=='const_unsafe_meth')].inner.header[*]" '"const"'
     // @has - "$.index[*][?(@.name=='const_unsafe_meth')].inner.header[*]" '"unsafe"'
     pub const unsafe fn const_unsafe_meth() {}
+
+    // It's impossible for a method to be both const and async, so no test for that
 }