about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-06-28 06:35:30 +0000
committerbors <bors@rust-lang.org>2015-06-28 06:35:30 +0000
commitc1b8bd2d6fd4a00522635112d3f7b28501552a65 (patch)
tree43924b80f480108f3e8dadeb8477e0fbdc29e1db
parent5da0d415b66733f9a146bbdd6c6cce81430e77c2 (diff)
parent9e58fb85efabadf40ecde8417ad74f7f8898991a (diff)
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 
-rw-r--r--src/librustc_driver/lib.rs3
-rw-r--r--src/rt/rust_try.ll2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
index 96d1ab23ad5..a9787987611 100644
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -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");
 
diff --git a/src/rt/rust_try.ll b/src/rt/rust_try.ll
index 226dc55cb8d..845fc097cdc 100644
--- a/src/rt/rust_try.ll
+++ b/src/rt/rust_try.ll
@@ -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) {