Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-14 00:47:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #15849 - HKalbasi:fix-sync, r=HKalbasi

Browse source 
Update rustc dependencies

Except `rustc_parse_format` that was broken by upstream.
This commit is contained in:
bors 2023-11-07 22:13:41 +00:00
commit 3b7c7f97e4
3 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Cargo.lock generated
View file

@ -1454,12 +1454,12 @@ dependencies = [
[[package]]
name = "ra-ap-rustc_abi"
version = "0.14.0"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a51b7a02377b3246ec5c095b852b5cf1678bd9ed6b572b2a79efbf7ad711c292"
checksum = "7082716cb2bbcd8b5f062fe950cbbc87f3aba022d6da4168db35af6732a7f15d"
dependencies = [
"bitflags 1.3.2",
"ra-ap-rustc_index",
"ra-ap-rustc_index 0.18.0",
"tracing",
]
@ -1473,6 +1473,16 @@ dependencies = [
"smallvec",
]
[[package]]
name = "ra-ap-rustc_index"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19e14b1fc835d6992b128a03a3f3a8365ba9f03e1c656a1670305f63f30d786d"
dependencies = [
"arrayvec",
"smallvec",
]
[[package]]
name = "ra-ap-rustc_lexer"
version = "0.14.0"
@ -1483,14 +1493,24 @@ dependencies = [
"unicode-xid",
]
[[package]]
name = "ra-ap-rustc_lexer"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1762abb25eb1e37c1823f62b5da0821bbcd870812318db084c9516c2f78d2dcd"
dependencies = [
"unicode-properties",
"unicode-xid",
]
[[package]]
name = "ra-ap-rustc_parse_format"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "207b5ac1a21d4926695e03b605ffb9f63d4968e0488e9197c04c512c37303aa7"
dependencies = [
"ra-ap-rustc_index",
"ra-ap-rustc_lexer",
"ra-ap-rustc_index 0.14.0",
"ra-ap-rustc_lexer 0.14.0",
]
[[package]]
@ -1614,8 +1634,8 @@ name = "rustc-dependencies"
version = "0.0.0"
dependencies = [
"ra-ap-rustc_abi",
"ra-ap-rustc_index",
"ra-ap-rustc_lexer",
"ra-ap-rustc_index 0.18.0",
"ra-ap-rustc_lexer 0.18.0",
"ra-ap-rustc_parse_format",
]

2
crates/hir-def/src/data/adt.rs
View file

@ -178,7 +178,7 @@ fn parse_repr_tt(tt: &Subtree) -> Option<ReprOptions> {
}
}
Some(ReprOptions { int, align: max_align, pack: min_pack, flags })
Some(ReprOptions { int, align: max_align, pack: min_pack, flags, field_shuffle_seed: 0 })
}
impl StructData {

6
crates/rustc-dependencies/Cargo.toml
View file

@ -11,10 +11,10 @@ authors.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
ra-ap-rustc_lexer = { version = "0.14.0" }
ra-ap-rustc_lexer = { version = "0.18.0" }
ra-ap-rustc_parse_format = { version = "0.14.0", default-features = false }
ra-ap-rustc_index = { version = "0.14.0", default-features = false }
ra-ap-rustc_abi = { version = "0.14.0", default-features = false }
ra-ap-rustc_index = { version = "0.18.0", default-features = false }
ra-ap-rustc_abi = { version = "0.18.0", default-features = false }
[features]
in-rust-tree = []