Skip to content

remove rtp.rs, and move rtpSpawn and RTP_ID_ERROR to libc - #64720

Merged
bors merged 5 commits into
rust-lang:masterfrom
Wind-River:master
Sep 25, 2019
Merged

remove rtp.rs, and move rtpSpawn and RTP_ID_ERROR to libc#64720
bors merged 5 commits into
rust-lang:masterfrom
Wind-River:master

Conversation

@BaoshanPang

@BaoshanPangBaoshanPang commented Sep 23, 2019

Copy link
Copy Markdown
Contributor

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 23, 2019
@BaoshanPang

BaoshanPang commented Sep 23, 2019

Copy link
Copy Markdown
ContributorAuthor

cc @n-salim

@alexcrichton

alexcrichton commented Sep 24, 2019

Copy link
Copy Markdown
Member

@bors: r+ rollup

@bors

bors commented Sep 24, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 75ecbe2 has been approved by alexcrichton

@borsbors 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 Sep 24, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 24, 2019
@Centril
Rollup merge ofrust-lang#64720- Wind-River:master, r=alexcrichton
e861424
 remove rtp.rs, and move rtpSpawn and RTP_ID_ERROR to libc
r? @alexcrichton
@CentrilCentril mentioned this pull request Sep 24, 2019
Merged
bors added a commit that referenced this pull request Sep 24, 2019
@bors
Auto merge of#64751- Centril:rollup-hpbmcfj, r=Centril
dcd473d
Rollup of 16 pull requests
Successful merges:
- #63356 (Issue#63183: Add fs::read_dir() and ReadDir warning about iterator order + example)
- #63934 (Fix coherence checking for impl trait in type aliases)
- #64016 (Streamline `Compiler`)
- #64296 (Document the unstable iter_order_by library feature)
- #64443 (rustdoc: general cleanup)
- #64622 (Add a cycle detector for generic `Graph`s and `mir::Body`s)
- #64689 (Refactor macro by example)
- #64698 (Recover on `const X = 42;` and infer type + Error Stash API)
- #64702 (Remove unused dependencies)
- #64717 (update mem::discriminant test to use assert_eq and assert_ne over comparison operators)
- #64720 ( remove rtp.rs, and move rtpSpawn and RTP_ID_ERROR to libc)
- #64721 (Fixed issue from #64447)
- #64725 (fix one typo)
- #64737 (fix several issues in String docs)
- #64742 (relnotes: make compatibility section more sterile and fix rustc version)
- #64748 (Fix#64744. Account for the Zero sub-pattern case.)
Failed merges:
r? @ghost
@bors
bors merged commit 75ecbe2 into rust-lang:masterSep 25, 2019
@bors

bors commented Sep 25, 2019

Copy link
Copy Markdown
Collaborator

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

@borsbors 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 Sep 25, 2019
@BaoshanPang

BaoshanPang commented Sep 26, 2019

Copy link
Copy Markdown
ContributorAuthor

@alexcrichton
Please help to nominate this one to beta too.

Thanks,
Baoshan

@alexcrichton

alexcrichton commented Sep 27, 2019

Copy link
Copy Markdown
Member

@BaoshanPang that's possible yeah, but to clarify, we typically don't do backports unless they're for critical patches or critical fixes. We're not necessarily 100% strict about that and small features can get backported as well. We don't have a ton of backported "third party" patches in our history (such as for targets like vxworks which the main project doesn't maintain).

I don't mind nominating one more to ensure they work together, but I don't think this is something that we'll want to do for a series of patches. Are there any more that need to be backported? Or is this the last one for 1.39?

@n-salim

n-salim commented Sep 27, 2019

Copy link
Copy Markdown
Contributor

@alexcrichton Thanks for the clarification on the backporting policy. This patch will bring VxWorks support in 1.39 in sync with what we have in nightly. If we made further fixes on nightly we'll do so with the understanding that they probably cannot get backported to 1.39.

@alexcrichton

alexcrichton commented Sep 27, 2019

Copy link
Copy Markdown
Member

Ok, sounds good! In that case I'm going to carry over the beta nomination/acceptance from #64818 since it's all part of the same.

@alexcrichtonalexcrichton added beta-nominated Nominated for backporting to the compiler in the beta channel. beta-accepted Accepted for backporting to the compiler in the beta channel. labels Sep 27, 2019
@tmandrytmandry mentioned this pull request Oct 2, 2019
Merged
tmandry added a commit to tmandry/rust that referenced this pull request Oct 2, 2019
@tmandry
Rollup merge ofrust-lang#64982- tmandry:beta-backport, r=tmandry
6d9465a
[BETA] Backport changes
- update rtpSpawn's parameters type(It's prototype has been updated in libc) rust-lang#64818
- Fix div_duration() marked as stable by mistake rust-lang#64815
- Use https for curl when building for linux rust-lang#64786
- remove rtp.rs, and move rtpSpawn and RTP_ID_ERROR to libc rust-lang#64720
r? @ghost
@tmandrytmandry removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichtonalexcrichton

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@BaoshanPang@alexcrichton@bors@n-salim@tmandry@rust-highfive@bpangWR