Fix double import in wasm thread #86807
Merged
Conversation
This file contains 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
The `unsupported` type is imported two times, as `super::unsupported` and as `crate::sys::unsupported`, throwing an error. Remove `super::unsupported` in favor of the other.
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon. Please see the contribution instructions for more information. |
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ rollup |
|
📌 Commit d3bf89b has been approved by |
bors
added
S-waiting-on-bors
|
Thanks! |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 2, 2021
Rollup of 7 pull requests Successful merges: - rust-lang#84029 (add `track_path::path` fn for usage in `proc_macro`s) - rust-lang#85001 (Merge `sys_common::bytestring` back into `os_str_bytes`) - rust-lang#86308 (Docs: clarify that certain intrinsics are not unsafe) - rust-lang#86796 (Add a regression test for issue-70703) - rust-lang#86803 (Remove & from Command::args calls in documentation) - rust-lang#86807 (Fix double import in wasm thread ) - rust-lang#86813 (Add a help message to `unused_doc_comments` lint) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The
unsupportedtype is imported two times, assuper::unsupportedand ascrate::sys::unsupported, throwing an error. Removesuper::unsupportedin favor of the other.As reported in #86802.
Fix #86802