diff options
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 12 | ||||
| -rw-r--r-- | src/librustdoc/html/format.rs | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 87151708812..be761341f1b 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -1079,7 +1079,7 @@ pub enum Primitive { F32, F64, Char, Bool, - Nil, + Unit, Str, Slice, PrimitiveTuple, @@ -1110,7 +1110,7 @@ impl Primitive { "u32" => Some(U32), "u64" => Some(U64), "bool" => Some(Bool), - "nil" => Some(Nil), + "unit" => Some(Unit), "char" => Some(Char), "str" => Some(Str), "f32" => Some(F32), @@ -1159,7 +1159,7 @@ impl Primitive { Str => "str", Bool => "bool", Char => "char", - Nil => "()", + Unit => "()", Slice => "slice", PrimitiveTuple => "tuple", } @@ -1167,7 +1167,7 @@ impl Primitive { pub fn to_url_str(&self) -> &'static str { match *self { - Nil => "nil", + Unit => "unit", other => other.to_str(), } } @@ -1184,7 +1184,7 @@ impl Clean<Type> for ast::Ty { fn clean(&self) -> Type { use syntax::ast::*; match self.node { - TyNil => Primitive(Nil), + TyNil => Primitive(Unit), TyPtr(ref m) => RawPointer(m.mutbl.clean(), box m.ty.clean()), TyRptr(ref l, ref m) => BorrowedRef {lifetime: l.clean(), mutability: m.mutbl.clean(), @@ -1214,7 +1214,7 @@ impl Clean<Type> for ty::t { fn clean(&self) -> Type { match ty::get(*self).sty { ty::ty_bot => Bottom, - ty::ty_nil => Primitive(Nil), + ty::ty_nil => Primitive(Unit), ty::ty_bool => Primitive(Bool), ty::ty_char => Primitive(Char), ty::ty_int(ast::TyI) => Primitive(Int), diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs index 9677b9004cd..cec665768d1 100644 --- a/src/librustdoc/html/format.rs +++ b/src/librustdoc/html/format.rs @@ -362,7 +362,7 @@ impl fmt::Show for clean::Type { }, args = decl.decl.inputs, arrow = match decl.decl.output { - clean::Primitive(clean::Nil) => "".to_string(), + clean::Primitive(clean::Unit) => "".to_string(), _ => format!(" -> {}", decl.decl.output), }, bounds = { @@ -411,7 +411,7 @@ impl fmt::Show for clean::Type { m.collect::<Vec<String>>().connect(" + ")) }, arrow = match decl.decl.output { - clean::Primitive(clean::Nil) => "".to_string(), + clean::Primitive(clean::Unit) => "".to_string(), _ => format!(" -> {}", decl.decl.output) }) } @@ -472,7 +472,7 @@ impl fmt::Show for clean::FnDecl { write!(f, "({args}){arrow}", args = self.inputs, arrow = match self.output { - clean::Primitive(clean::Nil) => "".to_string(), + clean::Primitive(clean::Unit) => "".to_string(), _ => format!(" -> {}", self.output), }) } @@ -505,7 +505,7 @@ impl<'a> fmt::Show for Method<'a> { write!(f, "({args}){arrow}", args = args, arrow = match d.output { - clean::Primitive(clean::Nil) => "".to_string(), + clean::Primitive(clean::Unit) => "".to_string(), _ => format!(" -> {}", d.output), }) } |