Skip to content
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

Update field-offset and enable unstable_offset_of #112298

Merged
merged 1 commit into from
Jun 10, 2023
Merged

Update field-offset and enable unstable_offset_of #112298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 14 additions & 5 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ dependencies = [
"autocfg",
"cfg-if",
"crossbeam-utils",
"memoffset",
"memoffset 0.8.0",
"scopeguard",
]

Expand Down Expand Up @@ -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",
]

Expand Down Expand Up @@ -2157,6 +2157,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"
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 3 additions & 1 deletion compiler/rustc_query_impl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the comment still accurate? this crate had the dep before

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw, unstable_const feature lost, maybe it needed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Grep for memoffset, there is no results.

Before it was included to enable the unstable_const feature, which <enabled usage of the pointer::offset_from function, but that function is not used if unstable_offset_of is enabled as that directly uses offset_of!().

The offset_of_tuple macro still doesn't use offset_of so unstable_const does something to the public API of memoffset still, but that macro is not used I think neither by rustc nor by any of its deps, at least that's my impression.

In other words, enabling unstable_const makes no sense at this point.

memoffset = { version = "0.9.0", features = ["unstable_offset_of"] }

[features]
rustc_use_parallel_compiler = ["rustc-rayon-core", "rustc_query_system/rustc_use_parallel_compiler"]