Rollup merge of rust-lang#25806 - nrc:20184-msg, r=alexcrichton

Closes rust-lang#20184
Manishearth · May 27, 2015 · aec0a4b · aec0a4b
2 parents 0e1a71c + ff68204
commit aec0a4b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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