Rollup merge of #112298 - est31:update_field_offset, r=Mark-Simulacrum

Update field-offset and enable unstable_offset_of

This makes the compiler use the builtin `offset_of!()` macro, through the wrappers in memoffset and then in field-offset.

cc  #111839
This commit is contained in:
Matthias Krüger
2023-06-10 15:24:43 +02:00
committed by GitHub
2 changed files with 17 additions and 6 deletions
+14 -5
View File
@@ -848,7 +848,7 @@ dependencies = [
"autocfg",
"cfg-if",
"crossbeam-utils",
"memoffset",
"memoffset 0.8.0",
"scopeguard",
]
@@ -1193,11 +1193,11 @@ dependencies = [
[[package]]
name = "field-offset"
version = "0.3.5"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535"
checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
dependencies = [
"memoffset",
"memoffset 0.9.0",
"rustc_version",
]
@@ -2145,6 +2145,15 @@ dependencies = [
"autocfg",
]
[[package]]
name = "memoffset"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
dependencies = [
"autocfg",
]
[[package]]
name = "mime"
version = "0.3.16"
@@ -3976,7 +3985,7 @@ version = "0.0.0"
dependencies = [
"field-offset",
"measureme",
"memoffset",
"memoffset 0.9.0",
"rustc-rayon-core",
"rustc_ast",
"rustc_data_structures",
+3 -1
View File
@@ -7,7 +7,6 @@ edition = "2021"
[dependencies]
memoffset = { version = "0.8.0", features = ["unstable_const"] }
field-offset = "0.3.5"
measureme = "10.0.0"
rustc_ast = { path = "../rustc_ast" }
@@ -25,5 +24,8 @@ rustc_span = { path = "../rustc_span" }
thin-vec = "0.2.12"
tracing = "0.1"
# Not used directly, but included to enable the unstable_offset_of feature
memoffset = { version = "0.9.0", features = ["unstable_offset_of"] }
[features]
rustc_use_parallel_compiler = ["rustc-rayon-core", "rustc_query_system/rustc_use_parallel_compiler"]