std: Upgrade compiler_builtins to fix wasi linkage by alexcrichton · Pull Request #59643 · rust-lang/rust (original) (raw)
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.
By clicking “Sign up for GitHub”, you agree to our terms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Conversation11 Commits1 Checks0 Files changed
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
[ Show hidden characters]({{ revealButtonHref }})
Turns out we needed to exclude a number of math functions on thewasm32-unknown-wasi target, and this was fixed in 0.1.9 of
compiler-builtins and this is pulling in the fix to libstd's own build.
(rust_highfive has picked a reviewer for you, use r? to override)
📌 Commit 7eb2efd has been approved by sanxiyn
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Centril added a commit to Centril/rust that referenced this pull request
std: Upgrade compiler_builtins to fix wasi linkage
Turns out we needed to exclude a number of math functions on the
wasm32-unknown-wasi target, and this was fixed in 0.1.9 of
compiler-builtins and this is pulling in the fix to libstd's own build.
bors added a commit that referenced this pull request
Rollup of 5 pull requests
Successful merges:
- #59076 (Include trailing comma in multiline Debug representation)
- #59619 (wasi: Implement more of the standard library)
- #59639 (Never return uninhabited values at all)
- #59643 (std: Upgrade
compiler_builtinsto fix wasi linkage) - #59664 (Updated the documentation of spin_loop and spin_loop_hint)
Failed merges:
r? @ghost
Centril added a commit to Centril/rust that referenced this pull request
std: Upgrade compiler_builtins to fix wasi linkage
Turns out we needed to exclude a number of math functions on the
wasm32-unknown-wasi target, and this was fixed in 0.1.9 of
compiler-builtins and this is pulling in the fix to libstd's own build.
Centril added a commit to Centril/rust that referenced this pull request
std: Upgrade compiler_builtins to fix wasi linkage
Turns out we needed to exclude a number of math functions on the
wasm32-unknown-wasi target, and this was fixed in 0.1.9 of
compiler-builtins and this is pulling in the fix to libstd's own build.
☔ The latest upstream changes (presumably #59089) made this pull request unmergeable. Please resolve the merge conflicts.
Status: This is awaiting some action (such as code changes or more information) from the author.
and removed S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
labels
📌 Commit 822284d88b662b49a1553e04daa3c8d96323f0b7 has been approved by sanxiyn
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
🔒 Merge conflict
This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.
How do I rebase?
Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:
git checkout wasi-symbols(switch to your branch)git fetch upstream master(retrieve the latest master)git rebase upstream/master -p(rebase on top of it)- Follow the on-screen instruction to resolve conflicts (check
git statusif you got lost). git push self wasi-symbols --force-with-lease(update this PR)
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.
Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.
Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.
Error message
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.
Status: This is awaiting some action (such as code changes or more information) from the author.
and removed S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
labels
Turns out we needed to exclude a number of math functions on the
wasm32-unknown-wasi target, and this was fixed in 0.1.9 of
compiler-builtins and this is pulling in the fix to libstd's own build.
📌 Commit 1bf04c9 has been approved by sanxiyn
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
Centril added a commit to Centril/rust that referenced this pull request
std: Upgrade compiler_builtins to fix wasi linkage
Turns out we needed to exclude a number of math functions on the
wasm32-unknown-wasi target, and this was fixed in 0.1.9 of
compiler-builtins and this is pulling in the fix to libstd's own build.
bors added a commit that referenced this pull request
std: Upgrade compiler_builtins to fix wasi linkage
Turns out we needed to exclude a number of math functions on the
wasm32-unknown-wasi target, and this was fixed in 0.1.9 of
compiler-builtins and this is pulling in the fix to libstd's own build.
Labels
This PR was explicitly merged by bors.
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.