Skip to content

Commit 0d1311a

Browse files
committed
Auto merge of #147074 - matthiaskrgr:rollup-sm3owsd, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - rust-lang/rust#145113 (resolve: Do not finalize shadowed bindings) - rust-lang/rust#146523 (Demote both armebv7r-none-* targets.) - rust-lang/rust#146704 (port `#[debugger_visualizer]` to the new attribute system) - rust-lang/rust#146758 (Stop linking rs{begin,end} objects on x86_64-*-windows-gnu) - rust-lang/rust#146778 (Use standard attribute logic for allocator shim) - rust-lang/rust#146849 (Reduce some uses of `LegacyBang`) - rust-lang/rust#147016 (fix doc comments to be more standard) - rust-lang/rust#147027 (Add new `tyalias` intra-doc link disambiguator) - rust-lang/rust#147031 (mbe: Simplify check_redundant_vis_repetition) - rust-lang/rust#147058 (Ignore more failing ui tests for GCC backend) Failed merges: - rust-lang/rust#147046 (Rename `rust.use-lld` to `rust.bootstrap-override-lld`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f21aef7 + 57c297a commit 0d1311a

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

crates/hir-expand/src/builtin/derive_macro.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use tracing::debug;
1212

1313
use crate::{
1414
ExpandError, ExpandResult, MacroCallId,
15-
builtin::quote::{dollar_crate, quote},
15+
builtin::quote::dollar_crate,
1616
db::ExpandDatabase,
1717
hygiene::span_with_def_site_ctxt,
1818
name::{self, AsName, Name},

crates/hir-expand/src/builtin/fn_macro.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use syntax_bridge::syntax_node_to_token_tree;
1919

2020
use crate::{
2121
EditionedFileId, ExpandError, ExpandResult, Lookup as _, MacroCallId,
22-
builtin::quote::{WithDelimiter, dollar_crate, quote},
22+
builtin::quote::{WithDelimiter, dollar_crate},
2323
db::ExpandDatabase,
2424
hygiene::{span_with_call_site_ctxt, span_with_def_site_ctxt},
2525
name,

crates/hir-expand/src/builtin/quote.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,6 @@ mod tests {
229229
use span::{Edition, ROOT_ERASED_FILE_AST_ID, SpanAnchor, SyntaxContext};
230230
use syntax::{TextRange, TextSize};
231231

232-
use super::quote;
233-
234232
const DUMMY: tt::Span = tt::Span {
235233
range: TextRange::empty(TextSize::new(0)),
236234
anchor: SpanAnchor {

0 commit comments

Comments
 (0)