diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-05-27 22:08:54 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-05-28 01:12:30 +0530 |
| commit | aec0a4ba8378c51c6e4669768b59141040dcd1a8 (patch) | |
| tree | ed0e49e2f029238b583838de132cc617814175af | |
| parent | 0e1a71c5af10ef2171c654febddb14127fcf4a21 (diff) | |
| parent | ff682048804453b67199acc9c64f332e58251c41 (diff) | |
| download | rust-aec0a4ba8378c51c6e4669768b59141040dcd1a8.tar.gz rust-aec0a4ba8378c51c6e4669768b59141040dcd1a8.zip | |
Rollup merge of #25806 - nrc:20184-msg, r=alexcrichton
Closes #20184
| -rw-r--r-- | src/librustc_trans/back/link.rs | 2 | ||||
| -rw-r--r-- | src/librustc_trans/back/write.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/asm-src-loc-codegen-units.rs | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs index 844a0a69867..c416a9810eb 100644 --- a/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs @@ -279,7 +279,7 @@ pub fn sanitize(s: &str) -> String { } pub fn mangle<PI: Iterator<Item=PathElem>>(path: PI, - hash: Option<&str>) -> String { + hash: Option<&str>) -> String { // Follow C++ namespace-mangling style, see // http://en.wikipedia.org/wiki/Name_mangling for more info. // diff --git a/src/librustc_trans/back/write.rs b/src/librustc_trans/back/write.rs index bd16e018bc4..5352c61d8c0 100644 --- a/src/librustc_trans/back/write.rs +++ b/src/librustc_trans/back/write.rs @@ -342,8 +342,8 @@ struct HandlerFreeVars<'a> { } unsafe extern "C" fn report_inline_asm<'a, 'b>(cgcx: &'a CodegenContext<'a>, - msg: &'b str, - cookie: c_uint) { + msg: &'b str, + cookie: c_uint) { use syntax::codemap::ExpnId; match cgcx.lto_ctxt { diff --git a/src/test/compile-fail/asm-src-loc-codegen-units.rs b/src/test/compile-fail/asm-src-loc-codegen-units.rs index 5ebcdb20b19..79f0c436759 100644 --- a/src/test/compile-fail/asm-src-loc-codegen-units.rs +++ b/src/test/compile-fail/asm-src-loc-codegen-units.rs @@ -8,7 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// ignore-stage1 (#20184) +// WONTFIX(#20184) Needs landing pads (not present in stage1) or the compiler hangs. +// ignore-stage1 // compile-flags: -C codegen-units=2 // error-pattern: build without -C codegen-units for more exact errors |