rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

auto merge of #12756 : pongad/rust/remove_owned_str_pat, r=alexcrichton

Browse Source 
match-drop-strs-issue-4541.rs deleted as it's the same with issue-4541.rs
This commit is contained in:
bors
2014-03-12 19:21:44 -07:00
parent 2eebeb8137 f079c94f72
commit a53242a1a3
17 changed files with 57 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/librustdoc/html/render.rs
View File

@@ -225,13 +225,13 @@ pub fn run(mut krate: clean::Crate, dst: Path) -> io::IoResult<()> {
Some(attrs) => {
for attr in attrs.iter() {
match *attr {
clean::NameValue(~"html_favicon_url", ref s) => {
clean::NameValue(ref x, ref s) if "html_favicon_url" == *x => {
cx.layout.favicon = s.to_owned();
}
clean::NameValue(~"html_logo_url", ref s) => {
clean::NameValue(ref x, ref s) if "html_logo_url" == *x => {
cx.layout.logo = s.to_owned();
}
clean::Word(~"html_no_source") => {
clean::Word(ref x) if "html_no_source" == *x => {
cx.include_sources = false;
}
_ => {}
@@ -396,10 +396,10 @@ fn extern_location(e: &clean::ExternalCrate, dst: &Path) -> ExternalLocation {
// external crate
for attr in e.attrs.iter() {
match *attr {
clean::List(~"doc", ref list) => {
clean::List(ref x, ref list) if "doc" == *x => {
for attr in list.iter() {
match *attr {
clean::NameValue(~"html_root_url", ref s) => {
clean::NameValue(ref x, ref s) if "html_root_url" == *x => {
if s.ends_with("/") {
return Remote(s.to_owned());
}
@@ -666,7 +666,7 @@ impl DocFolder for Cache {
// extract relevant documentation for this impl
match attrs.move_iter().find(|a| {
match *a {
clean::NameValue(~"doc", _) => true,
clean::NameValue(ref x, _) if "doc" == *x => true,
_ => false
}
}) {