Auto merge of #81502 - CraftSpider:method-abi, r=jyn514

bors · bors · commit ae00b62ceb7e · 2021-02-07T10:59:41.000Z
Add abi field to `Method` Also bumps version and adds a test (Will conflict with #81500, whichever is merged first) Rationale: It's possible for methods to have an ABI. This should be exposed in the JSON.
diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs
@@ -440,6 +440,7 @@ crate fn from_function_method(function: clean::Function, has_body: bool) -> Meth
         decl: decl.into(),
         generics: generics.into(),
         header: stringify_header(&header),
+        abi: header.abi.to_string(),
         has_body,
     }
 }
diff --git a/src/rustdoc-json-types/lib.rs b/src/rustdoc-json-types/lib.rs
@@ -294,6 +294,7 @@ pub struct Method {
     pub decl: FnDecl,
     pub generics: Generics,
     pub header: String,
+    pub abi: String,
     pub has_body: bool,
 }
 
diff --git a/src/test/rustdoc-json/method_abi.rs b/src/test/rustdoc-json/method_abi.rs
@@ -0,0 +1,25 @@
+// @has method_abi.json "$.index[*][?(@.name=='Foo')]"
+pub struct Foo;
+
+impl Foo {
+    // @has - "$.index[*][?(@.name=='abi_rust')].inner.abi" '"\"Rust\""'
+    pub fn abi_rust() {}
+
+    // @has - "$.index[*][?(@.name=='abi_c')].inner.abi" '"\"C\""'
+    pub extern "C" fn abi_c() {}
+
+    // @has - "$.index[*][?(@.name=='abi_system')].inner.abi" '"\"system\""'
+    pub extern "system" fn abi_system() {}
+}
+
+// @has method_abi.json "$.index[*][?(@.name=='Bar')]"
+pub trait Bar {
+    // @has - "$.index[*][?(@.name=='trait_abi_rust')].inner.abi" '"\"Rust\""'
+    fn trait_abi_rust();
+
+    // @has - "$.index[*][?(@.name=='trait_abi_c')].inner.abi" '"\"C\""'
+    extern "C" fn trait_abi_c();
+
+    // @has - "$.index[*][?(@.name=='trait_abi_system')].inner.abi" '"\"system\""'
+    extern "system" fn trait_abi_system();
+}

Original file line number	Diff line number	Diff line change
`@@ -440,6 +440,7 @@ crate fn from_function_method(function: clean::Function, has_body: bool) -> Meth`
`440`	`440`	`decl: decl.into(),`
`441`	`441`	`generics: generics.into(),`
`442`	`442`	`header: stringify_header(&header),`
	`443`	`+ abi: header.abi.to_string(),`
`443`	`444`	`has_body,`
`444`	`445`	`}`
`445`	`446`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,7 @@ pub struct Method {`
`294`	`294`	`pub decl: FnDecl,`
`295`	`295`	`pub generics: Generics,`
`296`	`296`	`pub header: String,`
	`297`	`+ pub abi: String,`
`297`	`298`	`pub has_body: bool,`
`298`	`299`	`}`
`299`	`300`