bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

librustdoc: remove unnecessary as_slice() calls

Browse source
This commit is contained in:
Jorge Aparicio 2014-11-27 14:19:27 -05:00
parent 8bb5ef9df5
commit e6bd217ce8
7 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -251,8 +251,8 @@ fn path(w: &mut fmt::Formatter, path: &clean::Path, print_all: bool,
Some(root) => {
let mut root = String::from_str(root.as_slice());
for seg in path.segments[..amt].iter() {
if "super" == seg.name.as_slice() ||
"self" == seg.name.as_slice() {
if "super" == seg.name ||
"self" == seg.name {
try!(write!(w, "{}::", seg.name));
} else {
root.push_str(seg.name.as_slice());
@ -337,7 +337,7 @@ fn primitive_link(f: &mut fmt::Formatter,
Some(root) => {
try!(write!(f, "<a href='{}{}/primitive.{}.html'>",
root,
path.ref0().as_slice().head().unwrap(),
path.ref0().head().unwrap(),
prim.to_url_str()));
needs_termination = true;
}

4
src/librustdoc/html/markdown.rs
View file

@ -231,7 +231,7 @@ pub fn render(w: &mut fmt::Formatter, s: &str, print_toc: bool) -> fmt::Result {
};
// Transform the contents of the header into a hyphenated string
let id = s.as_slice().words().map(|s| s.to_ascii_lower())
let id = s.words().map(|s| s.to_ascii_lower())
.collect::<Vec<String>>().connect("-");
// This is a terrible hack working around how hoedown gives us rendered
@ -393,7 +393,7 @@ impl LangString {
let mut seen_other_tags = false;
let mut data = LangString::all_false();
let mut tokens = string.as_slice().split(|c: char|
let mut tokens = string.split(|c: char|
!(c == '_' || c == '-' || c.is_alphanumeric())
);

22
src/librustdoc/html/render.rs
View file

@ -277,15 +277,15 @@ pub fn run(mut krate: clean::Crate,
for attr in attrs.iter() {
match *attr {
clean::NameValue(ref x, ref s)
if "html_favicon_url" == x.as_slice() => {
if "html_favicon_url" == *x => {
cx.layout.favicon = s.to_string();
}
clean::NameValue(ref x, ref s)
if "html_logo_url" == x.as_slice() => {
if "html_logo_url" == *x => {
cx.layout.logo = s.to_string();
}
clean::NameValue(ref x, ref s)
if "html_playground_url" == x.as_slice() => {
if "html_playground_url" == *x => {
cx.layout.playground_url = s.to_string();
markdown::PLAYGROUND_KRATE.with(|slot| {
if slot.borrow().is_none() {
@ -295,7 +295,7 @@ pub fn run(mut krate: clean::Crate,
});
}
clean::Word(ref x)
if "html_no_source" == x.as_slice() => {
if "html_no_source" == *x => {
cx.include_sources = false;
}
_ => {}
@ -434,7 +434,7 @@ fn build_index(krate: &clean::Crate, cache: &mut Cache) -> io::IoResult<String>
for (i, item) in cache.search_index.iter().enumerate() {
// Omit the path if it is same to that of the prior item.
let path;
if lastpath.as_slice() == item.path.as_slice() {
if lastpath == item.path {
path = "";
} else {
lastpath = item.path.to_string();
@ -513,10 +513,10 @@ fn write_shared(cx: &Context,
if path.exists() {
for line in BufferedReader::new(File::open(path)).lines() {
let line = try!(line);
if !line.as_slice().starts_with(key) {
if !line.starts_with(key) {
continue
}
if line.as_slice().starts_with(
if line.starts_with(
format!("{}['{}']", key, krate).as_slice()) {
continue
}
@ -670,12 +670,12 @@ fn extern_location(e: &clean::ExternalCrate, dst: &Path) -> ExternalLocation {
// external crate
for attr in e.attrs.iter() {
match *attr {
clean::List(ref x, ref list) if "doc" == x.as_slice() => {
clean::List(ref x, ref list) if "doc" == *x => {
for attr in list.iter() {
match *attr {
clean::NameValue(ref x, ref s)
if "html_root_url" == x.as_slice() => {
if s.as_slice().ends_with("/") {
if "html_root_url" == *x => {
if s.ends_with("/") {
return Remote(s.to_string());
}
return Remote(format!("{}/", s));
@ -964,7 +964,7 @@ impl DocFolder for Cache {
let dox = match attrs.into_iter().find(|a| {
match *a {
clean::NameValue(ref x, _)
if "doc" == x.as_slice() => {
if "doc" == *x => {
true
}
_ => false