bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustdoc: Use dyn keyword when rendering dynamic traits

Browse source 
The dyn keyword has been stable for a while now so rustdoc should start using it.
This commit is contained in:
Oliver Middleton 2018-10-15 00:48:57 +01:00
parent 14f42a732f
commit 86d5a33c89
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/librustdoc/html/format.rs
View file

@ -553,6 +553,9 @@ fn fmt_type(t: &clean::Type, f: &mut fmt::Formatter, use_absolute: bool) -> fmt:
f.write_str(name) f.write_str(name)
} }
clean::ResolvedPath{ did, ref typarams, ref path, is_generic } => { clean::ResolvedPath{ did, ref typarams, ref path, is_generic } => {
if typarams.is_some() {
f.write_str("dyn ")?;
}
// Paths like T::Output and Self::Output should be rendered with all segments // Paths like T::Output and Self::Output should be rendered with all segments
resolved_path(f, did, path, is_generic, use_absolute)?; resolved_path(f, did, path, is_generic, use_absolute)?;
tybounds(f, typarams) tybounds(f, typarams)

2
src/test/rustdoc/assoc-consts.rs
View file

@ -52,7 +52,7 @@ pub fn f(_: &(ToString + 'static)) {}
impl Bar { impl Bar {
// @has assoc_consts/struct.Bar.html '//*[@id="associatedconstant.F"]' \ // @has assoc_consts/struct.Bar.html '//*[@id="associatedconstant.F"]' \
// "const F: fn(_: &(ToString + 'static))" // "const F: fn(_: &(dyn ToString + 'static))"
pub const F: fn(_: &(ToString + 'static)) = f; pub const F: fn(_: &(ToString + 'static)) = f;
} }

4
src/test/rustdoc/inline_cross/issue-32881.rs
View file

@ -15,8 +15,8 @@
extern crate rustdoc_trait_object_impl; extern crate rustdoc_trait_object_impl;
// @has issue_32881/trait.Bar.html // @has issue_32881/trait.Bar.html
// @has - '//code' "impl<'a> Bar" // @has - '//code' "impl<'a> dyn Bar"
// @has - '//code' "impl<'a> Debug for Bar" // @has - '//code' "impl<'a> Debug for dyn Bar"
pub use rustdoc_trait_object_impl::Bar; pub use rustdoc_trait_object_impl::Bar;

2
src/test/rustdoc/test-parens.rs
View file

@ -11,5 +11,5 @@
#![crate_name = "foo"] #![crate_name = "foo"]
// @has foo/fn.foo.html // @has foo/fn.foo.html
// @has - '//*[@class="rust fn"]' "_: &(ToString + 'static)" // @has - '//*[@class="rust fn"]' "_: &(dyn ToString + 'static)"
pub fn foo(_: &(ToString + 'static)) {} pub fn foo(_: &(ToString + 'static)) {}