diff options
| author | bors <bors@rust-lang.org> | 2018-07-12 12:50:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-12 12:50:13 +0000 |
| commit | 7db82ccd765cbfe55c3d8a2c434bc6f9b986843d (patch) | |
| tree | 41bda55edea65f5ef3f02b198ce2984b97e666e2 /src/libsyntax_ext/assert.rs | |
| parent | d334027c58060449cc45b8e5cc37dd51ca077d30 (diff) | |
| parent | a7c2c68b135b40666bda030315007c29ce197901 (diff) | |
| download | rust-7db82ccd765cbfe55c3d8a2c434bc6f9b986843d.tar.gz rust-7db82ccd765cbfe55c3d8a2c434bc6f9b986843d.zip | |
Auto merge of #52303 - kennytm:rollup, r=kennytm
Rollup of 9 pull requests Successful merges: - #51816 (bootstrap: write texts to a .tmp file first for atomicity) - #51912 (impl Clone for Box<CStr>, Box<OsStr>, Box<Path>) - #52164 (use proper footnote syntax for references) - #52220 (Deny bare trait objects in `src/bootstrap`) - #52276 (rustc: Verify #[proc_macro] is only a word) - #52277 (Uncapitalize "If") - #52287 (Deny bare trait objects in src/librustc_resolve) - #52295 (Deny bare trait objects in src/libsyntax_ext) - #52298 (make reference to dirs crate clickable in terminals) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax_ext/assert.rs')
| -rw-r--r-- | src/libsyntax_ext/assert.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax_ext/assert.rs b/src/libsyntax_ext/assert.rs index fe4d599d824..8d0a04831fc 100644 --- a/src/libsyntax_ext/assert.rs +++ b/src/libsyntax_ext/assert.rs @@ -22,7 +22,7 @@ pub fn expand_assert<'cx>( cx: &'cx mut ExtCtxt, sp: Span, tts: &[TokenTree], -) -> Box<MacResult + 'cx> { +) -> Box<dyn MacResult + 'cx> { let mut parser = cx.new_parser_from_tts(tts); let cond_expr = panictry!(parser.parse_expr()); let custom_msg_args = if parser.eat(&token::Comma) { |