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.

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

Use correct tracking issue for c_variadic #57340

Merged
merged 1 commit into from
Jan 18, 2019
Merged

Conversation

eqrion
Copy link
Contributor

@eqrion eqrion commented Jan 4, 2019

Fixes #57306

@rust-highfive
Copy link
Collaborator

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.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 4, 2019
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 4, 2019

📌 Commit d39e15000b716468ba5970bc4ac3758e14ea8b94 has been approved by Mark-Simulacrum

@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 Jan 4, 2019
bors added a commit that referenced this pull request Jan 5, 2019
Rollup of 17 pull requests

Successful merges:

 - #57219 (Remove some unused code)
 - #57229 (Fix #56806 by using `delay_span_bug` in object safety layout sanity checks)
 - #57233 (Rename and fix nolink-with-link-args test)
 - #57238 (Fix backtraces for inlined functions on Windows)
 - #57249 (Fix broken links to second edition TRPL.)
 - #57267 (src/jemalloc is gone, remove its mention from COPYRIGHT)
 - #57273 (Update the stdsimd submodule)
 - #57278 (Add Clippy to config.toml.example)
 - #57295 (Fix 'be be' constructs)
 - #57311 (VaList::copy should not require a mutable ref)
 - #57312 (`const fn` is no longer coming soon (const keyword docs))
 - #57313 (Improve Box<T> -> Pin<Box<T>> conversion)
 - #57314 (Fix repeated word typos)
 - #57326 (Doc rewording, use the same name `writer`)
 - #57338 (rustdoc: force binary filename for compiled doctests)
 - #57342 (librustc_mir: Make qualify_min_const_fn module public)
 - #57343 (Calculate privacy access only via query)

Failed merges:

 - #57340 (Use correct tracking issue for c_variadic)

r? @ghost
@bors
Copy link
Contributor

bors commented Jan 5, 2019

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

@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 Jan 5, 2019
@stokhos
Copy link

stokhos commented Jan 14, 2019

Ping from triage @eqrion Have you been able to make any progress on this PR?

@eqrion
Copy link
Contributor Author

eqrion commented Jan 14, 2019

Apologies, I forgot about this.

@stokhos Merging was blocked on conflicts, I rebased past them so it should be good to merge again. Not sure if there's something I need to do to trigger this.

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 16, 2019

📌 Commit 6c60662 has been approved by Mark-Simulacrum

@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 Jan 16, 2019
Centril added a commit to Centril/rust that referenced this pull request Jan 17, 2019
…acrum

Use correct tracking issue for c_variadic

Fixes rust-lang#57306
Centril added a commit to Centril/rust that referenced this pull request Jan 17, 2019
…acrum

Use correct tracking issue for c_variadic

Fixes rust-lang#57306
Centril added a commit to Centril/rust that referenced this pull request Jan 17, 2019
…acrum

Use correct tracking issue for c_variadic

Fixes rust-lang#57306
Centril added a commit to Centril/rust that referenced this pull request Jan 18, 2019
…acrum

Use correct tracking issue for c_variadic

Fixes rust-lang#57306
Centril added a commit to Centril/rust that referenced this pull request Jan 18, 2019
…acrum

Use correct tracking issue for c_variadic

Fixes rust-lang#57306
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 18, 2019
…acrum

Use correct tracking issue for c_variadic

Fixes rust-lang#57306
Centril added a commit to Centril/rust that referenced this pull request Jan 18, 2019
…acrum

Use correct tracking issue for c_variadic

Fixes rust-lang#57306
bors added a commit that referenced this pull request Jan 18, 2019
Rollup of 10 pull requests

Successful merges:

 - #56594 (Remove confusing comment about ideally using `!` for `c_void`)
 - #57340 (Use correct tracking issue for c_variadic)
 - #57357 (Cleanup PartialEq docs.)
 - #57551 (resolve: Add a test for issue #57539)
 - #57636 (Fix sources sidebar not showing up)
 - #57646 (Fixes text becoming invisible when element targetted)
 - #57654 (Add some links in std::fs.)
 - #57683 (Document Unpin in std::prelude documentation)
 - #57685 (Enhance `Pin` impl applicability for `PartialEq` and `PartialOrd`.)
 - #57710 (Fix non-clickable urls)

Failed merges:

r? @ghost
@bors bors merged commit 6c60662 into rust-lang:master Jan 18, 2019
@eqrion eqrion deleted the doc/c_variadic branch January 22, 2019 17:59
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