diff options
| author | est31 <MTest31@outlook.com> | 2023-06-05 04:53:30 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2023-06-05 15:57:13 +0200 |
| commit | b048396f440274d8809baa59bc2bdf3aae8aeaa2 (patch) | |
| tree | f62134d45deb8cf720c1ca5ebf446adf31b55fc4 | |
| parent | 8ebf04225d358efe77b822081cebef657f88d35b (diff) | |
| download | rust-b048396f440274d8809baa59bc2bdf3aae8aeaa2.tar.gz rust-b048396f440274d8809baa59bc2bdf3aae8aeaa2.zip | |
Update field-offset and enable unstable_offset_of
This enables usage of the offset_of!() macro in the compiler, through the wrappers in memoffset and then in field-offset.
| -rw-r--r-- | Cargo.lock | 19 | ||||
| -rw-r--r-- | compiler/rustc_query_impl/Cargo.toml | 4 |
2 files changed, 17 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock index e7aa317ad75..53a9741e2e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -849,7 +849,7 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset", + "memoffset 0.8.0", "scopeguard", ] @@ -1204,11 +1204,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", ] @@ -2158,6 +2158,15 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3988,7 +3997,7 @@ version = "0.0.0" dependencies = [ "field-offset", "measureme", - "memoffset", + "memoffset 0.9.0", "rustc-rayon-core", "rustc_ast", "rustc_data_structures", diff --git a/compiler/rustc_query_impl/Cargo.toml b/compiler/rustc_query_impl/Cargo.toml index c9353b6fc9f..ac697a3ae3e 100644 --- a/compiler/rustc_query_impl/Cargo.toml +++ b/compiler/rustc_query_impl/Cargo.toml @@ -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"] |