Skip to content

minor: Sync from downstream #20268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jul 21, 2025
Merged

minor: Sync from downstream #20268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d2d7662
Auto merge of #143877 - xizheyin:143813, r=scottmcm,saethlin
bors Jul 15, 2025
e6f3795
Auto merge of #142903 - cjgillot:local-def-path-hash, r=compiler-errors
bors Jul 17, 2025
8444e5b
parse `const trait Trait`
fee1-dead Jul 13, 2025
9e04ab6
Auto merge of #143879 - fee1-dead-contrib:push-lrlpoouyqqry, r=fmease
bors Jul 17, 2025
6da114e
Auto merge of #141762 - compiler-errors:witnesser, r=lcnr
bors Jul 17, 2025
ba88986
Auto merge of #143545 - compiler-errors:coroutine-obl, r=oli-obk
bors Jul 18, 2025
f2840cd
Auto merge of #144114 - lnicola:sync-from-ra, r=lnicola
bors Jul 18, 2025
4f674e6
Auto merge of #143845 - cjgillot:stability-query, r=jieyouxu
bors Jul 18, 2025
8281302
Auto merge of #143784 - scottmcm:enums-again-new-ex2, r=dianqk
bors Jul 19, 2025
812f0d4
Auto merge of #143641 - Kobzol:tool-target, r=jieyouxu
bors Jul 19, 2025
f13fe5a
Auto merge of #144068 - dianqk:update-llvm, r=cuviper
bors Jul 20, 2025
d105b7e
Preparing for merge from rust-lang/rust
lnicola Jul 21, 2025
99894cc
Merge from rust-lang/rust
lnicola Jul 21, 2025
30333a6
Bump rustc crates
lnicola Jul 21, 2025
9f3adc5
Bump rustc-literal-escaper
lnicola Jul 21, 2025
d53f0b9
Revert "Bump rustc-literal-escaper"
lnicola Jul 21, 2025
e0e4e26
Downgrade ra-ap-rustc_parse_format
lnicola Jul 21, 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
41 changes: 26 additions & 15 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
vfs = { path = "./crates/vfs", version = "0.0.0" }
edition = { path = "./crates/edition", version = "0.0.0" }

ra-ap-rustc_lexer = { version = "0.121", default-features = false }
ra-ap-rustc_lexer = { version = "0.122", default-features = false }
ra-ap-rustc_parse_format = { version = "0.121", default-features = false }
ra-ap-rustc_index = { version = "0.121", default-features = false }
ra-ap-rustc_abi = { version = "0.121", default-features = false }
ra-ap-rustc_pattern_analysis = { version = "0.121", default-features = false }
ra-ap-rustc_index = { version = "0.122", default-features = false }
ra-ap-rustc_abi = { version = "0.122", default-features = false }
ra-ap-rustc_pattern_analysis = { version = "0.122", default-features = false }

# local crates that aren't published to crates.io. These should not have versions.

Expand Down
3 changes: 1 addition & 2 deletions crates/test-utils/src/minicore.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,8 +1011,7 @@ pub mod ops {
}

#[lang = "add_assign"]
#[const_trait]
pub trait AddAssign<Rhs = Self> {
pub const trait AddAssign<Rhs = Self> {
fn add_assign(&mut self, rhs: Rhs);
}

Expand Down
2 changes: 1 addition & 1 deletion rust-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a9fb6103b05c6ad6eee6bed4c0bb5a2e8e1024c6
e05ab47e6c418fb2b9faa2eae9a7e70c65c98eaa
Loading