-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
remove rtp.rs, and move rtpSpawn and RTP_ID_ERROR to libc #64720
Conversation
Sync to rust-lang/rust master
Sync to rust-lang/rust master
remove rtp.rs and move rtpSpawn, RTP_ID_ERROR to libc
cc @n-salim |
@bors: r+ rollup |
📌 Commit 75ecbe2 has been approved by |
remove rtp.rs, and move rtpSpawn and RTP_ID_ERROR to libc r? @alexcrichton
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
☔ The latest upstream changes (presumably #64751) made this pull request unmergeable. Please resolve the merge conflicts. |
@alexcrichton Thanks, |
@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? |
@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. |
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. |
[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
r? @alexcrichton