diff options
| author | bors <bors@rust-lang.org> | 2015-04-13 05:55:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-13 05:55:50 +0000 |
| commit | 49798c597f810fbce14959bdbcdae0b635a5bde9 (patch) | |
| tree | 8ffc335bd4ce1c13b6d1ed59e3e0080bc43dd02a /src/libsyntax | |
| parent | 0cf99c3e06e84d20d68da649c888d63c72f33971 (diff) | |
| parent | ef25b7d5389a68d50904a8b4f4785287fc7c6ac3 (diff) | |
| download | rust-49798c597f810fbce14959bdbcdae0b635a5bde9.tar.gz rust-49798c597f810fbce14959bdbcdae0b635a5bde9.zip | |
Auto merge of #24323 - rprichard:panic-line-type, r=alexcrichton
There are syntax extensions that call `std::rt::begin_unwind` passing it a `usize`. I updated the syntax extension to instead pass `u32`, but for bootstrapping reasons, I needed to create a `#[cfg(stage0)]` version of `std::rt::begin_unwind` and therefore also `panic!`.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/build.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index 5d0853761ee..cde16d25412 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -767,7 +767,7 @@ impl<'a> AstBuilder for ExtCtxt<'a> { let loc = self.codemap().lookup_char_pos(span.lo); let expr_file = self.expr_str(span, token::intern_and_get_ident(&loc.file.name)); - let expr_line = self.expr_usize(span, loc.line); + let expr_line = self.expr_u32(span, loc.line as u32); let expr_file_line_tuple = self.expr_tuple(span, vec!(expr_file, expr_line)); let expr_file_line_ptr = self.expr_addr_of(span, expr_file_line_tuple); self.expr_call_global( |