diff options
| author | bors <bors@rust-lang.org> | 2015-10-12 20:16:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-12 20:16:24 +0000 |
| commit | 5c7dbf6c0ea9c5e0b7c29c81962d1690dacce7a2 (patch) | |
| tree | 669cdcf6b55b0f85e2b0ac0d6e97e6246ee0dd03 | |
| parent | 8aa621a99676797e2217d8bbff41831e5ccf5834 (diff) | |
| parent | f65dbb1dc447d9f4f5c9d27980e087304f2afd3f (diff) | |
| download | rust-5c7dbf6c0ea9c5e0b7c29c81962d1690dacce7a2.tar.gz rust-5c7dbf6c0ea9c5e0b7c29c81962d1690dacce7a2.zip | |
Auto merge of #28986 - ahmedcharles:error-index-generator, r=brson
| -rw-r--r-- | src/error-index-generator/main.rs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/error-index-generator/main.rs b/src/error-index-generator/main.rs index cbb67014e27..4b10b02f2d4 100644 --- a/src/error-index-generator/main.rs +++ b/src/error-index-generator/main.rs @@ -34,10 +34,7 @@ fn load_all_errors(metadata_dir: &Path) -> Result<ErrorMetadataMap, Box<Error>> let path = try!(entry).path(); let mut metadata_str = String::new(); - try!( - File::open(&path).and_then(|mut f| - f.read_to_string(&mut metadata_str)) - ); + try!(File::open(&path).and_then(|mut f| f.read_to_string(&mut metadata_str))); let some_errors: ErrorMetadataMap = try!(json::decode(&metadata_str)); @@ -78,24 +75,23 @@ r##"<!DOCTYPE html> // Enclose each error in a div so they can be shown/hidden en masse. let desc_desc = match info.description { Some(_) => "error-described", - None => "error-undescribed" + None => "error-undescribed", }; let use_desc = match info.use_site { Some(_) => "error-used", - None => "error-unused" + None => "error-unused", }; try!(write!(&mut output_file, "<div class=\"{} {}\">", desc_desc, use_desc)); // Error title (with self-link). try!(write!(&mut output_file, - "<h2 id=\"{0}\" class=\"section-header\"><a href=\"#{0}\">{0}</a></h2>\n", - err_code - )); + "<h2 id=\"{0}\" class=\"section-header\"><a href=\"#{0}\">{0}</a></h2>\n", + err_code)); // Description rendered as markdown. match info.description { Some(ref desc) => try!(write!(&mut output_file, "{}", Markdown(desc))), - None => try!(write!(&mut output_file, "<p>No description.</p>\n")) + None => try!(write!(&mut output_file, "<p>No description.</p>\n")), } try!(write!(&mut output_file, "</div>\n")); |