diff options
| author | bors <bors@rust-lang.org> | 2017-07-27 04:25:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-27 04:25:37 +0000 |
| commit | e574ba4994c00b1e166ce4e450b7b984e1bff5d4 (patch) | |
| tree | 222f3e6c234d44a78afc884451f14b4edd949340 /src/libsyntax/ext | |
| parent | 4a42ff482367afa83b6cdb1fbfad2ee69f836f97 (diff) | |
| parent | 90ac6408baa80fcd7fa28bc98af6046dba8c4bbb (diff) | |
| download | rust-e574ba4994c00b1e166ce4e450b7b984e1bff5d4.tar.gz rust-e574ba4994c00b1e166ce4e450b7b984e1bff5d4.zip | |
Auto merge of #43477 - est31:master, r=alexcrichton
Switch to begin_panic again In https://github.com/rust-lang/rust/pull/42938 we made the compiler emit a call to begin_panic_new in order to pass column info to it. Now with stage0 updated (https://github.com/rust-lang/rust/pull/43320), we can safely change begin_panic and start emitting calls for it again.
Diffstat (limited to 'src/libsyntax/ext')
| -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 2555bf6dea7..d8140417214 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -774,7 +774,7 @@ impl<'a> AstBuilder for ExtCtxt<'a> { let expr_loc_ptr = self.expr_addr_of(span, expr_loc_tuple); self.expr_call_global( span, - self.std_path(&["rt", "begin_panic_new"]), + self.std_path(&["rt", "begin_panic"]), vec![ self.expr_str(span, msg), expr_loc_ptr]) |