Revert "Re-export core::ffi types from std::ffi" #96492
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
T-libs
Contributor
|
Hey! It looks like you've submitted a new PR for the library teams! If this PR contains changes to any Examples of
|
Contributor
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
joshtriplett
added
the
beta-nominated
Member
Author
|
As discussed in the libs-api meeting; could I get a review and beta-accepted on this? Turns out we don't need to revert the whole |
This comment has been minimized.
This comment has been minimized.
This reverts commit 9aed829. Fixes rust-lang#96435 , a regression in crates doing `use std::ffi::*;` and `use std::os::raw::*;`. We can re-add this re-export once the `core::ffi` types are stable, and thus the `std::os::raw` types can become re-exports as well, which will avoid the conflict. (Type aliases to the same type still conflict, but re-exports of the same type don't.)
joshtriplett
force-pushed
the
revert-std-ffi-re-export
branch
from
671bfde to
07ea143
Compare
Member
|
@bors r+ |
Collaborator
|
📌 Commit 07ea143 has been approved by |
bors
added
S-waiting-on-bors
Mark-Simulacrum
added
the
beta-accepted
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Apr 29, 2022
…rt, r=yaahc Revert "Re-export core::ffi types from std::ffi" This reverts commit 9aed829. Fixes rust-lang#96435 , a regression in crates doing `use std::ffi::*;` and `use std::os::raw::*;`. We can re-add this re-export once the `core::ffi` types are stable, and thus the `std::os::raw` types can become re-exports as well, which will avoid the conflict. (Type aliases to the same type still conflict, but re-exports of the same type don't.)
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 29, 2022
Rollup of 5 pull requests Successful merges: - rust-lang#96477 (Update data layout string for wasm64-unknown-unknown) - rust-lang#96481 (HashMap doc: Don't use monospace font for 'Entry Api') - rust-lang#96492 (Revert "Re-export core::ffi types from std::ffi") - rust-lang#96516 (Revert diagnostic duplication and accidental stabilization) - rust-lang#96523 (Add ``@feat.00`` symbol to symbols.o for COFF) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
ehuss
pushed a commit
to ehuss/rust
that referenced
this pull request
May 4, 2022
…rt, r=yaahc Revert "Re-export core::ffi types from std::ffi" This reverts commit 9aed829. Fixes rust-lang#96435 , a regression in crates doing `use std::ffi::*;` and `use std::os::raw::*;`. We can re-add this re-export once the `core::ffi` types are stable, and thus the `std::os::raw` types can become re-exports as well, which will avoid the conflict. (Type aliases to the same type still conflict, but re-exports of the same type don't.)
Merged
ehuss
removed
the
beta-nominated
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 4, 2022
[beta] Beta backports * Revert diagnostic duplication and accidental stabilization rust-lang#96516 * Revert "Re-export core::ffi types from std::ffi" rust-lang#96492 * Make [e]println macros eagerly drop temporaries (for backport) rust-lang#96490 * Revert "impl From<&[T; N]> and From<&mut [T; N]> for Vec<T>" rust-lang#96489 * Cargo: * move workspace inheritance unstable docs to the correct place (rust-lang/cargo#10616)
MabezDev
pushed a commit
to esp-rs/rust
that referenced
this pull request
May 17, 2022
…rt, r=yaahc Revert "Re-export core::ffi types from std::ffi" This reverts commit 9aed829. Fixes rust-lang#96435 , a regression in crates doing `use std::ffi::*;` and `use std::os::raw::*;`. We can re-add this re-export once the `core::ffi` types are stable, and thus the `std::os::raw` types can become re-exports as well, which will avoid the conflict. (Type aliases to the same type still conflict, but re-exports of the same type don't.)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit 9aed829.
Fixes #96435 , a regression
in crates doing
use std::ffi::*;anduse std::os::raw::*;.We can re-add this re-export once the
core::ffitypesare stable, and thus the
std::os::rawtypes can become re-exports aswell, which will avoid the conflict. (Type aliases to the same type
still conflict, but re-exports of the same type don't.)