Auto merge of #26631 - richo:comment-updates, r=steveklabnik

I've attempted to lurk these into a few PRs since they're tiny, but those PR's haven't landed so here they are.

r? @steveklabnik
This commit is contained in:
bors 2015-06-28 06:35:30 +00:00
commit c1b8bd2d6f
2 changed files with 2 additions and 3 deletions

View File

@ -481,8 +481,7 @@ pub fn commit_date_str() -> Option<&'static str> {
option_env!("CFG_VER_DATE")
}
/// Prints version information and returns None on success or an error
/// message on panic.
/// Prints version information
pub fn version(binary: &str, matches: &getopts::Matches) {
let verbose = matches.opt_present("verbose");

View File

@ -12,7 +12,7 @@
; When f(...) returns normally, the return value is null.
; When f(...) throws, the return value is a pointer to the caught exception object.
; See also: libstd/rt/unwind.rs
; See also: libstd/rt/unwind/mod.rs
define i8* @rust_try(void (i8*)* %f, i8* %env) {