Skip to content

Commit c1b8bd2

Browse files
committed
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
2 parents 5da0d41 + 9e58fb8 commit c1b8bd2

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/librustc_driver/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,7 @@ pub fn commit_date_str() -> Option<&'static str> {
481481
option_env!("CFG_VER_DATE")
482482
}
483483

484-
/// Prints version information and returns None on success or an error
485-
/// message on panic.
484+
/// Prints version information
486485
pub fn version(binary: &str, matches: &getopts::Matches) {
487486
let verbose = matches.opt_present("verbose");
488487

src/rt/rust_try.ll

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
; When f(...) returns normally, the return value is null.
1313
; When f(...) throws, the return value is a pointer to the caught exception object.
1414

15-
; See also: libstd/rt/unwind.rs
15+
; See also: libstd/rt/unwind/mod.rs
1616

1717
define i8* @rust_try(void (i8*)* %f, i8* %env) {
1818

0 commit comments

Comments
 (0)