Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
c17873d
Rollup merge of #146753 - tiif:unsatisfiable-unstable-feature, r=BoxyUwU
matthiaskrgr Sep 24, 2025
37dc017
Auto merge of #146981 - weihanglo:update-cargo, r=weihanglo
bors Sep 25, 2025
af56430
Auto merge of #147003 - matthiaskrgr:rollup-b5z9uiz, r=matthiaskrgr
bors Sep 25, 2025
508ff8a
Auto merge of #146697 - cjgillot:invalidate-patch, r=lcnr
bors Sep 25, 2025
26a9dac
resolve: Do not finalize shadowed bindings
petrochenkov Aug 1, 2025
a97637f
Auto merge of #146919 - lcnr:yeet-fast-path, r=fee1-dead
bors Sep 25, 2025
c7284d7
Auto merge of #145882 - m-ou-se:format-args-extend-1-arg, r=petrochenkov
bors Sep 26, 2025
f21aef7
Auto merge of #146595 - Shourya742:make-cargo-test-work-for-self-test…
bors Sep 26, 2025
21c3fe8
Rollup merge of #145113 - petrochenkov:lessfinalize, r=lcnr
matthiaskrgr Sep 26, 2025
bb23265
Rollup merge of #146523 - thejpster:demote-armebv7r-targets, r=jackh726
matthiaskrgr Sep 26, 2025
4852229
Rollup merge of #146704 - jdonszelmann:port-debug-visualizer, r=petro…
matthiaskrgr Sep 26, 2025
e0f06b7
Rollup merge of #146758 - mati865:amd64_mingw_no_rs_objects, r=petroc…
matthiaskrgr Sep 26, 2025
7b730a3
Rollup merge of #146778 - nikic:allocator-shim-attributes, r=jackh726
matthiaskrgr Sep 26, 2025
b7bc6df
Rollup merge of #146849 - joshtriplett:macro-reduce-legacy-bang, r=pe…
matthiaskrgr Sep 26, 2025
8ae1783
Rollup merge of #147016 - hkBst:whitespace-1, r=nnethercote
matthiaskrgr Sep 26, 2025
f22620a
Rollup merge of #147027 - GuillaumeGomez:tyalias-disambiguator, r=lol…
matthiaskrgr Sep 26, 2025
114bcdd
Rollup merge of #147031 - joshtriplett:mbe-opt-collect, r=lcnr
matthiaskrgr Sep 26, 2025
57c297a
Rollup merge of #147058 - GuillaumeGomez:ignore-more-ui-tests, r=Kobzol
matthiaskrgr Sep 26, 2025
0d1311a
Auto merge of #147074 - matthiaskrgr:rollup-sm3owsd, r=matthiaskrgr
bors Sep 27, 2025
97fb5fc
Auto merge of #146636 - Mark-Simulacrum:bootstrap-bump, r=jieyouxu
bors Sep 27, 2025
4b3b444
Auto merge of #146829 - cjgillot:jump-threading-loop-dominator, r=dianqk
bors Sep 27, 2025
b9baa60
Auto merge of #146927 - Kobzol:install-clif, r=jieyouxu
bors Sep 27, 2025
6876493
Auto merge of #147042 - Noratrieb:untrack-caller-vec, r=tgross35
bors Sep 28, 2025
b98660c
Auto merge of #147045 - notriddle:search-index-entrydata-path, r=Guil…
bors Sep 28, 2025
7291893
Auto merge of #147002 - notriddle:stringdex3, r=GuillaumeGomez
bors Sep 28, 2025
fa0421c
Prepare for merging from rust-lang/rust
invalid-email-address Sep 29, 2025
253554e
Merge ref 'f957826bff7a' from rust-lang/rust
invalid-email-address Sep 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/hir-expand/src/builtin/derive_macro.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use tracing::debug;

use crate::{
ExpandError, ExpandResult, MacroCallId,
builtin::quote::{dollar_crate, quote},
builtin::quote::dollar_crate,
db::ExpandDatabase,
hygiene::span_with_def_site_ctxt,
name::{self, AsName, Name},
Expand Down
2 changes: 1 addition & 1 deletion crates/hir-expand/src/builtin/fn_macro.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use syntax_bridge::syntax_node_to_token_tree;

use crate::{
EditionedFileId, ExpandError, ExpandResult, Lookup as _, MacroCallId,
builtin::quote::{WithDelimiter, dollar_crate, quote},
builtin::quote::{WithDelimiter, dollar_crate},
db::ExpandDatabase,
hygiene::{span_with_call_site_ctxt, span_with_def_site_ctxt},
name,
Expand Down
2 changes: 0 additions & 2 deletions crates/hir-expand/src/builtin/quote.rs
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,6 @@ mod tests {
use span::{Edition, ROOT_ERASED_FILE_AST_ID, SpanAnchor, SyntaxContext};
use syntax::{TextRange, TextSize};

use super::quote;

const DUMMY: tt::Span = tt::Span {
range: TextRange::empty(TextSize::new(0)),
anchor: SpanAnchor {
Expand Down
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
caccb4d0368bd918ef6668af8e13834d07040417
f957826bff7a68b267ce75b1ea56352aed0cca0a
Loading