diff options
| author | bors <bors@rust-lang.org> | 2019-09-03 19:17:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-03 19:17:28 +0000 |
| commit | d097af105526a8defe413c64d79766333bb2085b (patch) | |
| tree | 7fde58f97eaf6a4a4c9581871410644f83774a82 /src/libsyntax/ext/base.rs | |
| parent | 72bfc375356b56933955e07471f91ef97dceaa94 (diff) | |
| parent | 5f51210cc08b466d5ebc53448c8b150c82b0ef80 (diff) | |
| download | rust-d097af105526a8defe413c64d79766333bb2085b.tar.gz rust-d097af105526a8defe413c64d79766333bb2085b.zip | |
Auto merge of #64097 - pietroalbini:beta-rollup, r=pietroalbini
[beta] Rollup backports Rolled up: * [beta] Utilize released stable over dev-static #64046 Cherry picked: * Update rust-installer to limit memory use #63984 * debuginfo: give unique names to closure and generator types #63875 * ci: move libc mirrors to the rust-lang-ci-mirrors bucket #63772 * Fix nested eager expansions in arguments of `format_args` #63717 r? @ghost
Diffstat (limited to 'src/libsyntax/ext/base.rs')
| -rw-r--r-- | src/libsyntax/ext/base.rs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 7f4feff6be6..50ae052b4b7 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -944,9 +944,6 @@ pub fn expr_to_spanned_string<'a>( mut expr: P<ast::Expr>, err_msg: &str, ) -> Result<Spanned<(Symbol, ast::StrStyle)>, Option<DiagnosticBuilder<'a>>> { - // Update `expr.span`'s ctxt now in case expr is an `include!` macro invocation. - expr.span = expr.span.apply_mark(cx.current_expansion.id); - // we want to be able to handle e.g., `concat!("foo", "bar")` cx.expander().visit_expr(&mut expr); Err(match expr.node { |