Skip to content

Conversation

d-e-s-o
Copy link
Contributor

@d-e-s-o d-e-s-o commented Jul 6, 2018

No description provided.

@rust-highfive
Copy link
Contributor

r? @sfackler

(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 Jul 6, 2018
@sfackler
Copy link
Member

sfackler commented Jul 6, 2018

@bors r+ rollup

Thanks!

@bors
Copy link
Collaborator

bors commented Jul 6, 2018

📌 Commit fa7f7ac has been approved by sfackler

@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 Jul 6, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Jul 6, 2018
@zackmdavis
Copy link
Contributor

@d-e-s-o I'm confused—this seems to be based on a fairly old master (parent of fa7f7ac is 21ea121 from May 19) and has an identical diff as your earlier merged pull request #50913 (based off of 3ea2491, also from May 19)? The spelling is correct on master (precisely because of #50913).

bors added a commit that referenced this pull request Jul 6, 2018
Rollup of 14 pull requests

Successful merges:

 - #51619 (rust: add initial changes to support powerpc64le musl)
 - #51793 (Fix variant background color on hover in search results)
 - #52005 (Update LLVM to bring in a wasm codegen fix)
 - #52016 (Deduplicate error reports for statics)
 - #52019 ([cross-lang-lto] Allow the linker to choose the LTO-plugin (which is useful when using LLD))
 - #52030 (Any docs preposition change)
 - #52031 (Strenghten synchronization in `Arc::is_unique`)
 - #52033 ([Gardening] Update outdated comments: ByVal -> Scalar)
 - #52055 (Include VS 2017 in error message.)
 - #52063 (Add a link to the rustc docs)
 - #52073 (Add a punch card to weird expressions test)
 - #52080 (Improve dependency deduplication diagnostics)
 - #52093 (rustc: Update tracking issue for wasm_import_module)
 - #52096 (Fix typo in cell.rs)

Failed merges:
@bors bors merged commit fa7f7ac into rust-lang:master Jul 6, 2018
@d-e-s-o
Copy link
Contributor Author

d-e-s-o commented Jul 7, 2018

@zackmdavis sorry. I was going through the changes I had staged somewhere and did not find that one upstream. But it got merged in the past, you are right.

@d-e-s-o d-e-s-o deleted the fix-typo branch July 7, 2018 02:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants