Skip to content
Permalink
Browse files

Fix display of const generics in rustdoc

  • Loading branch information...
GuillaumeGomez committed May 12, 2019
1 parent 548add7 commit 2caeaf54a1d44b1fe95c3ecaee9daa4ac576fd76
Showing with 35 additions and 4 deletions.
  1. +4 −1 src/librustdoc/clean/mod.rs
  2. +1 −3 src/librustdoc/html/format.rs
  3. +30 −0 src/test/rustdoc/generic-const.rs
@@ -3149,7 +3149,10 @@ impl<'tcx> Clean<Constant> for ty::Const<'tcx> {
fn clean(&self, cx: &DocContext<'_>) -> Constant {
Constant {
type_: self.ty.clean(cx),
expr: format!("{:?}", self.val), // FIXME(const_generics)
expr: match self.val {
ConstValue::Param(ty::ParamConst { name, .. }) => format!("{}", name),
e => format!("{:?}", e), // FIXME generic consts with expressions
},
}
}
}
@@ -262,9 +262,7 @@ impl fmt::Display for clean::Lifetime {

impl fmt::Display for clean::Constant {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
fmt::Display::fmt(&self.expr, f)?;
f.write_str(": ")?;
fmt::Display::fmt(&self.type_, f)
fmt::Display::fmt(&self.expr, f)
}
}

@@ -0,0 +1,30 @@
#![feature(const_generics)]
#![crate_name = "foo"]

// ignore-tidy-linelength

pub enum Order {
Sorted,
Unsorted,
}

// @has foo/struct.VSet.html '//pre[@class="rust struct"]' 'pub struct VSet<T, const ORDER: Order>'
// @has foo/struct.VSet.html '//h3[@id="impl-Send"]/code' 'impl<const ORDER: Order, T> Send for VSet<T, ORDER>'
// @has foo/struct.VSet.html '//h3[@id="impl-Sync"]/code' 'impl<const ORDER: Order, T> Sync for VSet<T, ORDER>'
pub struct VSet<T, const ORDER: Order> {
inner: Vec<T>,
}

// @has foo/struct.VSet.html '//h3[@id="impl"]/code' 'impl<T> VSet<T, { Order::Sorted }>'
impl <T> VSet<T, {Order::Sorted}> {
pub fn new() -> Self {
Self { inner: Vec::new() }
}
}

// @has foo/struct.VSet.html '//h3[@id="impl-1"]/code' 'impl<T> VSet<T, { Order::Unsorted }>'
impl <T> VSet<T, {Order::Unsorted}> {
pub fn new() -> Self {
Self { inner: Vec::new() }
}
}

0 comments on commit 2caeaf5

Please sign in to comment.
You can’t perform that action at this time.