mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary 'Primitive' prefix on PrimitiveType enum variants.

Browse Source
This commit is contained in:
Corey Farwell 2016-08-23 18:51:56 -04:00
parent 9dde563990
commit 5c849f4a50
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/librustdoc/clean/mod.rs
View File

@ -1485,8 +1485,8 @@ pub enum PrimitiveType {
Str,
Slice,
Array,
PrimitiveTuple,
PrimitiveRawPointer,
Tuple,
RawPointer,
}
#[derive(Clone, RustcEncodable, RustcDecodable, Copy, Debug)]
@ -1520,8 +1520,8 @@ impl Type {
FixedVector(..) | BorrowedRef { type_: box FixedVector(..), .. } => {
Some(PrimitiveType::Array)
}
Tuple(..) => Some(PrimitiveType::PrimitiveTuple),
RawPointer(..) => Some(PrimitiveType::PrimitiveRawPointer),
Tuple(..) => Some(PrimitiveType::Tuple),
RawPointer(..) => Some(PrimitiveType::RawPointer),
_ => None,
}
}
@ -1563,8 +1563,8 @@ impl PrimitiveType {
"f64" => Some(PrimitiveType::F64),
"array" => Some(PrimitiveType::Array),
"slice" => Some(PrimitiveType::Slice),
"tuple" => Some(PrimitiveType::PrimitiveTuple),
"pointer" => Some(PrimitiveType::PrimitiveRawPointer),
"tuple" => Some(PrimitiveType::Tuple),
"pointer" => Some(PrimitiveType::RawPointer),
_ => None,
}
}
@ -1601,8 +1601,8 @@ impl PrimitiveType {
PrimitiveType::Char => "char",
PrimitiveType::Array => "array",
PrimitiveType::Slice => "slice",
PrimitiveType::PrimitiveTuple => "tuple",
PrimitiveType::PrimitiveRawPointer => "pointer",
PrimitiveType::Tuple => "tuple",
PrimitiveType::RawPointer => "pointer",
}
}
@ -2454,8 +2454,8 @@ fn build_deref_target_impls(cx: &DocContext,
PrimitiveType::Str => tcx.lang_items.str_impl(),
PrimitiveType::Slice => tcx.lang_items.slice_impl(),
PrimitiveType::Array => tcx.lang_items.slice_impl(),
PrimitiveType::PrimitiveTuple => None,
PrimitiveType::PrimitiveRawPointer => tcx.lang_items.const_ptr_impl(),
PrimitiveType::Tuple => None,
PrimitiveType::RawPointer => tcx.lang_items.const_ptr_impl(),
};
if let Some(did) = did {
if !did.is_local() {

14
src/librustdoc/html/format.rs
View File

@ -468,16 +468,16 @@ impl fmt::Display for clean::Type {
}
clean::Tuple(ref typs) => {
match &typs[..] {
&[] => primitive_link(f, PrimitiveType::PrimitiveTuple, "()"),
&[] => primitive_link(f, PrimitiveType::Tuple, "()"),
&[ref one] => {
primitive_link(f, PrimitiveType::PrimitiveTuple, "(")?;
primitive_link(f, PrimitiveType::Tuple, "(")?;
write!(f, "{},", one)?;
primitive_link(f, PrimitiveType::PrimitiveTuple, ")")
primitive_link(f, PrimitiveType::Tuple, ")")
}
many => {
primitive_link(f, PrimitiveType::PrimitiveTuple, "(")?;
primitive_link(f, PrimitiveType::Tuple, "(")?;
write!(f, "{}", CommaSep(&many))?;
primitive_link(f, PrimitiveType::PrimitiveTuple, ")")
primitive_link(f, PrimitiveType::Tuple, ")")
}
}
}
@ -496,11 +496,11 @@ impl fmt::Display for clean::Type {
clean::RawPointer(m, ref t) => {
match **t {
clean::Generic(_) | clean::ResolvedPath {is_generic: true, ..} => {
primitive_link(f, clean::PrimitiveType::PrimitiveRawPointer,
primitive_link(f, clean::PrimitiveType::RawPointer,
&format!("*{}{}", RawMutableSpace(m), t))
}
_ => {
primitive_link(f, clean::PrimitiveType::PrimitiveRawPointer,
primitive_link(f, clean::PrimitiveType::RawPointer,
&format!("*{}", RawMutableSpace(m)))?;
write!(f, "{}", t)
}