diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 80494e38110..4c2cd8864c7 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -1055,27 +1055,6 @@ fn clean(&self, cx: &DocContext) -> Item { } } -#[derive(Clone, RustcEncodable, RustcDecodable, PartialEq, Show)] -pub struct ClosureDecl { - pub lifetimes: Vec, - pub decl: FnDecl, - pub onceness: ast::Onceness, - pub unsafety: ast::Unsafety, - pub bounds: Vec, -} - -impl Clean for ast::ClosureTy { - fn clean(&self, cx: &DocContext) -> ClosureDecl { - ClosureDecl { - lifetimes: self.lifetimes.clean(cx), - decl: self.decl.clean(cx), - onceness: self.onceness, - unsafety: self.unsafety, - bounds: self.bounds.clean(cx) - } - } -} - #[derive(Clone, RustcEncodable, RustcDecodable, PartialEq, Show)] pub struct FnDecl { pub inputs: Arguments, @@ -1352,8 +1331,6 @@ pub enum Type { Generic(String), /// Primitives are just the fixed-size numeric types (plus int/uint/float), and char. Primitive(PrimitiveType), - Closure(Box), - Proc(Box), /// extern "ABI" fn BareFunction(Box), Tuple(Vec), diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs index 4bfde9e5d7d..61d2a9ee071 100644 --- a/src/librustdoc/html/format.rs +++ b/src/librustdoc/html/format.rs @@ -465,61 +465,6 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { } clean::Infer => write!(f, "_"), clean::Primitive(prim) => primitive_link(f, prim, prim.to_string()), - clean::Closure(ref decl) => { - write!(f, "{style}{lifetimes}|{args}|{bounds}{arrow}", - style = UnsafetySpace(decl.unsafety), - lifetimes = if decl.lifetimes.len() == 0 { - "".to_string() - } else { - format!("for <{}>", - CommaSep(decl.lifetimes.as_slice())) - }, - args = decl.decl.inputs, - arrow = decl.decl.output, - bounds = { - let mut ret = String::new(); - for bound in decl.bounds.iter() { - match *bound { - clean::RegionBound(..) => {} - clean::TraitBound(ref t, modifier) => { - if ret.len() == 0 { - ret.push_str(": "); - } else { - ret.push_str(" + "); - } - if modifier == ast::TraitBoundModifier::Maybe { - ret.push_str("?"); - } - ret.push_str(format!("{}", - *t).as_slice()); - } - } - } - ret - }) - } - clean::Proc(ref decl) => { - write!(f, "{style}{lifetimes}proc({args}){bounds}{arrow}", - style = UnsafetySpace(decl.unsafety), - lifetimes = if decl.lifetimes.len() == 0 { - "".to_string() - } else { - format!("for <{}>", - CommaSep(decl.lifetimes.as_slice())) - }, - args = decl.decl.inputs, - bounds = if decl.bounds.len() == 0 { - "".to_string() - } else { - let m = decl.bounds - .iter() - .map(|s| s.to_string()); - format!( - ": {}", - m.collect::>().connect(" + ")) - }, - arrow = decl.decl.output) - } clean::BareFunction(ref decl) => { write!(f, "{}{}fn{}{}", UnsafetySpace(decl.unsafety),