Update libc version required by rustc #56562

pnkfelix · 2018-12-06T13:43:16Z

This is meant to be an easy-to-backport fix for #55465

rust-highfive · 2018-12-06T13:43:27Z

r? @alexcrichton

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

alexcrichton · 2018-12-06T14:29:51Z

@bors: r+

bors · 2018-12-06T14:29:52Z

📌 Commit c6fbf950104d94f133335aeed7dcddaa6f1fecba has been approved by alexcrichton

he32 · 2018-12-07T13:44:47Z

Hm, frustrating -- this one didn't go through and hence didn't make 1.31.0.

bors · 2018-12-07T15:21:07Z

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

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

Mark-Simulacrum · 2018-12-07T18:25:24Z

I've nominated this for beta backport (so it'll make 1.32 if we approve); I'm also adding a stable nomination but at least for now I don't believe we've accumulated enough reasons to release a point release.

bors · 2018-12-10T18:54:02Z

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

…t-lang/libc#1057. Part of issue rust-lang#55465

pnkfelix · 2018-12-12T15:24:55Z

The version update commit is easy to cherry-pick on its own.

There was a conflict with PR #56666 because that also touched Cargo.lock, and in doing so, it also upgraded the libc to an even more current version...

I assume though that we are not planning on backporting #56666. Therefore:

I will leave the beta-nominated and stable-nominated tags on this PR
(and will update the PR so that it does not attempt to touch the Cargo.lock, since the version update included here should I think be compatible with the Cargo.lock introduced by PR Update Rustfmt and RLS #56666),
And thus I will leave this PR open. If I didn't think we would backport this PR to the beta branch, I would probably just close this PR (Update libc version required by rustc #56562), since I think it would have no effect on the nightly channel given the changes injected by PR Update Rustfmt and RLS #56666.

Whomever does do a backport of this PR (#56562), if such a backport is done at all, should make sure to actually commit any update to the Cargo.lock file on the target branch for the backport.

alexcrichton · 2018-12-12T15:31:41Z

@bors: r+

👍

bors · 2018-12-12T15:31:43Z

💡 This pull request was already approved, no need to approve it again.

This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
There's another pull request that is currently being tested, blocking this pull request: std: Depend directly on crates.io crates #56092

bors · 2018-12-12T15:31:44Z

📌 Commit c6fbf950104d94f133335aeed7dcddaa6f1fecba has been approved by alexcrichton

…rsion, r=alexcrichton Update libc version required by rustc This is meant to be an easy-to-backport fix for rust-lang#55465

@ghost

Rollup of 14 pull requests (first batch) Successful merges: - #56562 (Update libc version required by rustc) - #56609 (Unconditionally emit the target-cpu LLVM attribute.) - #56637 (rustdoc: Fix local reexports of proc macros) - #56658 (Add non-panicking `maybe_new_parser_from_file` variant) - #56695 (Fix irrefutable matches on integer ranges) - #56699 (Use a `newtype_index!` within `Symbol`.) - #56702 ([self-profiler] Add column for percent of total time) - #56708 (Remove some unnecessary feature gates) - #56709 (Remove unneeded extra chars to reduce search-index size) - #56744 (specialize: remove Boxes used by Children::insert) - #56748 (Update panic message to be clearer about env-vars) - #56749 (x86: Add the `adx` target feature to whitelist) - #56756 (Disable btree pretty-printers on older gdbs) - #56789 (rustc: Add an unstable `simd_select_bitmask` intrinsic) r? @ghost

pietroalbini · 2018-12-16T12:32:31Z

cc @rust-lang/libs, should this PR be backported to stable (1.31.1)?

alexcrichton · 2018-12-16T16:21:40Z

This in an of itself doesn't warrant a point release, but if one is already happening then it's safe for this to be included

@ghost

[beta] Rollup backports PRs accepted for backport: * #56781: Update LLVM submodule * #56615: Update the book to fix some edition-related bugs * #56562: Update libc version required by rustc * #56282: Fix #56237: normalize type before deferred sizedness checking. * Release notes for Rust 1.31.1 Approved PRs targeting beta: * #56819: [beta] rustdoc: fix line numbers display for [src] pages * #56893: [beta] Revert "Update CI-clang to 7.0.0 for Linux dists." r? @ghost

@Mark-Simulacrum

[stable] 1.31.1 point release Rust 1.31.1 is scheduled to be released on Thursday 20th, with the following changes: * #56562: Update libc version required by rustc *(different patch made by me)* * #56615: Update the book to fix some edition-related bugs * rls submodule update to [`b379ef7`](rust-lang/rls@b379ef7), including: * rust-lang/rls#1170: Fix for common infinte loop regression * rust-lang/rls#1171: Can't jump to std defs r? @Mark-Simulacrum cc @rust-lang/core @rust-lang/release

Pkgsrc changes: * Sadly, I had to reinstate the "make tar files" rust code to make it possible to build cross-compiled bootstrap kits. * Add an adjustable "BUILD_TARGET", "dist" for cross-building a bootstrap kit, "build" for a normal native build. * New bootstrap kits built for NetBSD/powerpc, NetBSD/earmv7hf, and NetBSD/sparc64 version 1.31.1. * gcc-wrap script amended to also drop -Wl,--enable-new-dtags (so it could be used outside pkgsrc) * Worked around use of AtomicU64 in release build tool (ugly band-aid patch). Some platforms lack support for that type and associated operations. Upstream changes: - [Fix Rust failing to build on `powerpc-unknown-netbsd`][56562] - [Fix broken go-to-definition in RLS][rls/1171] - [Fix infinite loop on hover in RLS][rls/1170] [56562]: rust-lang/rust#56562 [rls/1171]: rust-lang/rls#1171 [rls/1170]: rust-lang/rls#1170

rust-highfive assigned alexcrichton Dec 6, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 6, 2018

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 Dec 6, 2018

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 Dec 7, 2018

Mark-Simulacrum added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Dec 7, 2018

Mark-Simulacrum added the stable-nominated Nominated for backporting to the compiler in the stable channel. label Dec 7, 2018

Increase required version for crates.io libc to get fix from PR rus…

8b67eb8

…t-lang/libc#1057. Part of issue rust-lang#55465

pnkfelix force-pushed the issue-55465-update-libc-version branch from c6fbf95 to 8b67eb8 Compare December 12, 2018 15:25

pnkfelix added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Dec 12, 2018

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 Dec 12, 2018

kennytm mentioned this pull request Dec 13, 2018

Rollup of 32 pull requests #56775

Closed

kennytm added a commit to kennytm/rust that referenced this pull request Dec 13, 2018

Rollup merge of rust-lang#56562 - pnkfelix:issue-55465-update-libc-ve…

055e288

…rsion, r=alexcrichton Update libc version required by rustc This is meant to be an easy-to-backport fix for rust-lang#55465

kennytm mentioned this pull request Dec 14, 2018

Rollup of 36 pull requests #56803

Closed

kennytm added a commit to kennytm/rust that referenced this pull request Dec 14, 2018

Rollup merge of rust-lang#56562 - pnkfelix:issue-55465-update-libc-ve…

85f28cc

…rsion, r=alexcrichton Update libc version required by rustc This is meant to be an easy-to-backport fix for rust-lang#55465

kennytm mentioned this pull request Dec 14, 2018

Rollup of 14 pull requests #56816

Closed

kennytm mentioned this pull request Dec 14, 2018

Rollup of 14 pull requests (first batch) #56818

Merged

kennytm added a commit to kennytm/rust that referenced this pull request Dec 14, 2018

Rollup merge of rust-lang#56562 - pnkfelix:issue-55465-update-libc-ve…

e065de2

…rsion, r=alexcrichton Update libc version required by rustc This is meant to be an easy-to-backport fix for rust-lang#55465

bors merged commit 8b67eb8 into rust-lang:master Dec 14, 2018

alexcrichton added the stable-accepted Accepted for backporting to the compiler in the stable channel. label Dec 16, 2018

pietroalbini mentioned this pull request Dec 17, 2018

[stable] 1.31.1 point release #56911

Merged

pietroalbini removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label Dec 17, 2018

pietroalbini mentioned this pull request Dec 17, 2018

[beta] Rollup backports #56930

Merged

pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Dec 17, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update libc version required by rustc #56562

Update libc version required by rustc #56562

pnkfelix commented Dec 6, 2018

rust-highfive commented Dec 6, 2018

alexcrichton commented Dec 6, 2018

bors commented Dec 6, 2018

he32 commented Dec 7, 2018

bors commented Dec 7, 2018

Mark-Simulacrum commented Dec 7, 2018

bors commented Dec 10, 2018

pnkfelix commented Dec 12, 2018 •

edited

Loading

alexcrichton commented Dec 12, 2018

bors commented Dec 12, 2018

bors commented Dec 12, 2018

pietroalbini commented Dec 16, 2018

alexcrichton commented Dec 16, 2018

Update libc version required by rustc #56562

Update libc version required by rustc #56562

Conversation

pnkfelix commented Dec 6, 2018

rust-highfive commented Dec 6, 2018

alexcrichton commented Dec 6, 2018

bors commented Dec 6, 2018

he32 commented Dec 7, 2018

bors commented Dec 7, 2018

Mark-Simulacrum commented Dec 7, 2018

bors commented Dec 10, 2018

pnkfelix commented Dec 12, 2018 • edited Loading

alexcrichton commented Dec 12, 2018

bors commented Dec 12, 2018

bors commented Dec 12, 2018

pietroalbini commented Dec 16, 2018

alexcrichton commented Dec 16, 2018

pnkfelix commented Dec 12, 2018 •

edited

Loading