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

Jump to bottom

std: Update compiler-builtins crate #60491

Merged
merged 1 commit into from May 9, 2019
Merged

std: Update compiler-builtins crate #60491

merged 1 commit into from May 9, 2019

Conversation

alexcrichton
Copy link
Member

Pulls in a fix for ensuring that wasm targets have code in
compiler-builtins for ldexp which LLVM can generate references to.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 2, 2019
@bors
Copy link
Contributor

bors commented May 4, 2019

☔ The latest upstream changes (presumably #60117) made this pull request unmergeable. Please resolve the merge conflicts.

@alexcrichton alexcrichton force-pushed the update-cb branch 2 times, most recently from 1dce7d3 to e90b1a4 Compare May 6, 2019 15:48
This was referenced May 7, 2019
Closed
Open
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented May 7, 2019

📌 Commit e90b1a4dc684768b8b84d907774db0147e7b7529 has been approved by nikomatsakis

@bors bors added S-waiting-on-bors 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 May 7, 2019
@bors
Copy link
Contributor

bors commented May 7, 2019

🔒 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:

  1. git checkout update-cb (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self update-cb --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.

@bors bors added S-waiting-on-author 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 May 7, 2019
@alexcrichton
std: Update compiler-builtins crate
7e80355 
Pulls in a fix for ensuring that wasm targets have code in
compiler-builtins for `ldexp` which LLVM can generate references to.
@alexcrichton
Copy link
Member Author

@bors: r=nikomatsakis

@bors
Copy link
Contributor

bors commented May 8, 2019

📌 Commit 7e80355 has been approved by nikomatsakis

@bors bors added S-waiting-on-bors 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 May 8, 2019
Centril added a commit to Centril/rust that referenced this pull request May 8, 2019
@Centril
Rollup merge of rust-lang#60491 - alexcrichton:update-cb, r=nikomatsakis
804d1ce 
std: Update compiler-builtins crate

Pulls in a fix for ensuring that wasm targets have code in
compiler-builtins for `ldexp` which LLVM can generate references to.
Centril added a commit to Centril/rust that referenced this pull request May 8, 2019
@Centril
Rollup merge of rust-lang#60491 - alexcrichton:update-cb, r=nikomatsakis
4dc3a53 
std: Update compiler-builtins crate

Pulls in a fix for ensuring that wasm targets have code in
compiler-builtins for `ldexp` which LLVM can generate references to.
@Centril Centril mentioned this pull request May 8, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request May 8, 2019
@Centril
Rollup merge of rust-lang#60491 - alexcrichton:update-cb, r=nikomatsakis
2ace070 
std: Update compiler-builtins crate

Pulls in a fix for ensuring that wasm targets have code in
compiler-builtins for `ldexp` which LLVM can generate references to.
This was referenced May 8, 2019
Closed
Closed
@bors
Copy link
Contributor

bors commented May 8, 2019

⌛ Testing commit 7e80355 with merge a2aae270d174e8855c7b9099793eed67467a1d05...

Centril added a commit to Centril/rust that referenced this pull request May 8, 2019
@Centril
Rollup merge of rust-lang#60491 - alexcrichton:update-cb, r=nikomatsakis
cfed892 
std: Update compiler-builtins crate

Pulls in a fix for ensuring that wasm targets have code in
compiler-builtins for `ldexp` which LLVM can generate references to.
@Centril Centril mentioned this pull request May 8, 2019
Merged
@Centril
Copy link
Contributor

Centril commented May 8, 2019

@bors retry

added to #60651.

bors added a commit that referenced this pull request May 8, 2019
@bors
Auto merge of #60651 - Centril:rollup-zoamjfk, r=Centril
9f83961 
Rollup of 8 pull requests

Successful merges:

 - #59979 (to_xe_bytes for isize and usize returns an array of different size)
 - #60491 (std: Update compiler-builtins crate)
 - #60550 (Add tests for concrete const types)
 - #60572 (Add test for #59972)
 - #60627 (test for #50518)
 - #60634 (Document + Cleanup lang_items.rs)
 - #60641 (Instead of ICEing on incorrect pattern, use delay_span_bug)
 - #60644 (Use `delay_span_bug` for "Failed to unify obligation")

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented May 9, 2019

⌛ Testing commit 7e80355 with merge 9f83961...

@bors bors merged commit 7e80355 into rust-lang:master May 9, 2019
@mati865 mati865 mentioned this pull request May 13, 2019
Closed
@alexcrichton alexcrichton deleted the update-cb branch July 8, 2019 20:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@alexcrichton @rust-highfive @bors @nikomatsakis @Centril