nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-11 15:23:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix has_body for trait methods

Browse Source
This commit is contained in:
Rune Tynan 2021-01-23 20:37:56 -05:00
parent 74500b9978
commit a2f5c72a2d
No known key found for this signature in database
GPG Key ID: 7ECC932F8B2C731E
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/librustdoc/json/conversions.rs
View File

@ -162,8 +162,8 @@ impl From<clean::ItemKind> for ItemEnum {
ForeignFunctionItem(f) => ItemEnum::FunctionItem(f.into()), ForeignFunctionItem(f) => ItemEnum::FunctionItem(f.into()),
TraitItem(t) => ItemEnum::TraitItem(t.into()), TraitItem(t) => ItemEnum::TraitItem(t.into()),
TraitAliasItem(t) => ItemEnum::TraitAliasItem(t.into()), TraitAliasItem(t) => ItemEnum::TraitAliasItem(t.into()),
MethodItem(m, _) => ItemEnum::MethodItem(m.into()), MethodItem(m, _) => ItemEnum::MethodItem(from_function_method(m, true)),
TyMethodItem(m) => ItemEnum::MethodItem(m.into()), TyMethodItem(m) => ItemEnum::MethodItem(from_function_method(m, false)),
ImplItem(i) => ItemEnum::ImplItem(i.into()), ImplItem(i) => ItemEnum::ImplItem(i.into()),
StaticItem(s) => ItemEnum::StaticItem(s.into()), StaticItem(s) => ItemEnum::StaticItem(s.into()),
ForeignStaticItem(s) => ItemEnum::StaticItem(s.into()), ForeignStaticItem(s) => ItemEnum::StaticItem(s.into()),
@ -435,15 +435,13 @@ impl From<clean::Impl> for Impl {
} }
} }
impl From<clean::Function> for Method { crate fn from_function_method(function: clean::Function, has_body: bool) -> Method {
fn from(function: clean::Function) -> Self { let clean::Function { header, decl, generics, all_types: _, ret_types: _ } = function;
let clean::Function { header, decl, generics, all_types: _, ret_types: _ } = function; Method {
Method { decl: decl.into(),
decl: decl.into(), generics: generics.into(),
generics: generics.into(), header: stringify_header(&header),
header: stringify_header(&header), has_body,
has_body: true,
}
} }
} }

22
src/test/rustdoc-json/traits/has_body.rs Normal file
View File

@ -0,0 +1,22 @@
// @has has_body.json "$.index[*][?(@.name=='Foo')]"
pub trait Foo {
// @has - "$.index[*][?(@.name=='no_self')].inner.has_body" false
fn no_self();
// @has - "$.index[*][?(@.name=='move_self')].inner.has_body" false
fn move_self(self);
// @has - "$.index[*][?(@.name=='ref_self')].inner.has_body" false
fn ref_self(&self);
// @has - "$.index[*][?(@.name=='no_self_def')].inner.has_body" true
fn no_self_def() {}
// @has - "$.index[*][?(@.name=='move_self_def')].inner.has_body" true
fn move_self_def(self) {}
// @has - "$.index[*][?(@.name=='ref_self_def')].inner.has_body" true
fn ref_self_def(&self) {}
}
pub trait Bar: Clone {
// @has - "$.index[*][?(@.name=='method')].inner.has_body" false
fn method(&self, param: usize);
}