Rollup of 9 pull requests #72681

JohnTitor · 2020-05-28T06:55:42Z

Successful merges:

impl From<[T; N]> for Box<[T]> #71095 (impl From<[T; N]> for Box<[T]>)
Impl Error for Infallible #71633 (Impl Error for Infallible)
Tweak and stabilize AtomicN::fetch_update #71843 (Tweak and stabilize AtomicN::fetch_update)
Stabilization of weak-into-raw #72288 (Stabilization of weak-into-raw)
Stabilize AtomicN::fetch_min and AtomicN::fetch_max #72324 (Stabilize AtomicN::fetch_min and AtomicN::fetch_max)
Clarified the documentation for Formatter::precision #72452 (Clarified the documentation for Formatter::precision)
Stabilize str_strip feature #72466 (Stabilize str_strip feature)
Added a codegen test for a recent optimization for overflow-checks=on #72547 (Added a codegen test for a recent optimization for overflow-checks=on)
Add myself to .mailmap #72645 (Add myself to .mailmap)

Failed merges:

r? @ghost

Co-authored-by: Ralf Jung <post@ralfj.de>

Stabilizes rust-lang#60728.

Based on rust-lang#68692

Closes rust-lang#58692

impl From<[T; N]> for Box<[T]> Based on rust-lang#68692

Impl Error for Infallible This PR only changes the place where `impl Error for Infallible` is documented, as one could think that it is not the case when reading https://doc.rust-lang.org/nightly/std/convert/enum.Infallible.html. Fixes rust-lang#70842

@mystor

Tweak and stabilize AtomicN::fetch_update The fetch_update method implements a compare-and-swap loop to update the value in an atomic to an arbitrary value computed by a closure. I've applied a few tweaks suggested by @mystor in this comment on the tracking issue: rust-lang#48655 (comment). Specifically, the load and store ordering arguments have been swapped to match with the orderings of `compare_exchange`, and the closure has been moved from the first to last argument. Moving the closure to the last argument is a change away from other methods on the atomic types which place the ordering(s) last, but matches with the broad convention that closure arguments come last in functions. In particular, rustfmt style lays calls with multi-line closures out more cleanly when the closure comes last.

…tolnay Stabilization of weak-into-raw Closes rust-lang#60728. There are also two removals of `#![feature(weak_into_raw)]` in the `src/tools/miri` submodule. How should I synchronize the changes with there? * I can ignore it for now and once this gets merged, update the tool, send a pull request to that one and then reference the changes to rustc. * I could try submitting the changes to miri first, but then the build would fail there, because the attribute would still be needed. I think the first one is the correct one, extrapolating from the contributing guidelines (even though they speak about breaking the tools and this should not break it, as extra feature should not hurt).

Stabilize AtomicN::fetch_min and AtomicN::fetch_max Some architectures (ARMv8.1 LSE and RISC-V) have specific instructions for atomic min/max which the compiler can only generate through explicit instrinsics.

Clarified the documentation for Formatter::precision Added a note that `precision` is interpreted as max-width when formatting strings

Stabilize str_strip feature This PR stabilizes these APIs: ```rust impl str { /// Returns a string slice with the prefix removed. /// /// If the string starts with the pattern `prefix`, `Some` is returned with the substring where /// the prefix is removed. Unlike `trim_start_matches`, this method removes the prefix exactly /// once. pub fn strip_prefix<'a, P: Pattern<'a>>(&'a self, prefix: P) -> Option<&'a str>; /// Returns a string slice with the suffix removed. /// /// If the string ends with the pattern `suffix`, `Some` is returned with the substring where /// the suffix is removed. Unlike `trim_end_matches`, this method removes the suffix exactly /// once. pub fn strip_suffix<'a, P>(&'a self, suffix: P) -> Option<&'a str> where P: Pattern<'a>, <P as Pattern<'a>>::Searcher: ReverseSearcher<'a>; } ``` Closes rust-lang#67302

Added a codegen test for a recent optimization for overflow-checks=on Closes rust-lang#58692

Add myself to .mailmap

JohnTitor · 2020-05-28T06:56:45Z

@bors r+ p=9 rollup=never

bors · 2020-05-28T06:56:46Z

📌 Commit 08cc539 has been approved by JohnTitor

bors · 2020-05-28T07:14:52Z

⌛ Testing commit 08cc539 with merge a02e0d628e9fc72ec8be0371f7d89d29145484cb...

bors · 2020-05-28T11:29:52Z

💥 Test timed out

JohnTitor · 2020-05-28T11:32:34Z

@bors retry

bors · 2020-05-28T15:34:55Z

⌛ Testing commit 08cc539 with merge 2197671ab87fb8dd66dc6e799fb43304ad565967...

bors · 2020-05-28T17:18:46Z

💔 Test failed - checks-azure

JohnTitor · 2020-05-28T17:38:25Z

Since the previous macOS build was successful, I'd say it's spurious:

failures:

---- [run-make] run-make-fulldeps/long-linker-command-lines stdout ----

error: make failed
status: exit code: 2
command: "make"
stdout:
------------------------------------------
DYLD_LIBRARY_PATH="/Users/runner/runners/2.168.2/work/1/s/build/x86_64-apple-darwin/test/run-make-fulldeps/long-linker-command-lines/long-linker-command-lines:/Users/runner/runners/2.168.2/work/1/s/build/x86_64-apple-darwin/stage2/lib:" '/Users/runner/runners/2.168.2/work/1/s/build/x86_64-apple-darwin/stage2/bin/rustc' --out-dir /Users/runner/runners/2.168.2/work/1/s/build/x86_64-apple-darwin/test/run-make-fulldeps/long-linker-command-lines/long-linker-command-lines -L /Users/runner/runners/2.168.2/work/1/s/build/x86_64-apple-darwin/test/run-make-fulldeps/long-linker-command-lines/long-linker-command-lines  foo.rs -g -O
RUSTC="/Users/runner/runners/2.168.2/work/1/s/build/x86_64-apple-darwin/stage2/bin/rustc" DYLD_LIBRARY_PATH="/Users/runner/runners/2.168.2/work/1/s/build/x86_64-apple-darwin/test/run-make-fulldeps/long-linker-command-lines/long-linker-command-lines:/Users/runner/runners/2.168.2/work/1/s/build/x86_64-apple-darwin/stage2/lib/rustlib/x86_64-apple-darwin/lib:" /Users/runner/runners/2.168.2/work/1/s/build/x86_64-apple-darwin/test/run-make-fulldeps/long-linker-command-lines/long-linker-command-lines/foo
attempt: 100
attempt: 200
attempt: 300

------------------------------------------
stderr:
------------------------------------------
warning: variable does not need to be mutable
  --> foo.rs:93:13
   |
93 |         for mut arg in linker_args.split('S') {
   |             ----^^^
   |             |
   |             help: remove this `mut`
   |
   = note: `#[warn(unused_mut)]` on by default

warning: 1 warning emitted

thread 'main' panicked at 'status: exit code: 1
stdout:

stderr:
error: could not exec the linker `/Users/runner/runners/2.168.2/work/1/s/build/x86_64-apple-darwin/test/run-make-fulldeps/long-linker-command-lines/long-linker-command-lines/foo`
  |

', foo.rs:76:13
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
make: *** [all] Error 101

@bors retry

Dylan-DPC-zz · 2020-05-28T19:04:01Z

@bors r-

I am closing this since it'll be a while this gets merged and the queue will grow so might as well create a bigger one

a1phyr and others added 19 commits April 28, 2020 11:22

Impl Error for Infallible

ef485c6

Tweak and stabilize AtomicN::fetch_update

2ce3f85

Update src/libcore/sync/atomic.rs

31c8205

Co-authored-by: Ralf Jung <post@ralfj.de>

Stabilization of weak-into-raw

ba0d0c2

Stabilizes rust-lang#60728.

Stabilize AtomicN::fetch_min and AtomicN::fetch_max

1d7a731

impl From<[T; N]> for Box<[T]>

a8ed9aa

Based on rust-lang#68692

Clarified the documentation for Formatter::precision

526dbd3

Stabilize str_strip feature

2df69ba

Added a codegen test for a recent optimization for overflow-checks=on

cd5f228

Closes rust-lang#58692

Add myself to .mailmap

42ddcd3

Rollup merge of rust-lang#71095 - pickfire:box-from-array, r=dtolnay

cb31457

impl From<[T; N]> for Box<[T]> Based on rust-lang#68692

Rollup merge of rust-lang#72324 - Amanieu:atomic_minmax, r=dtolnay

7caf5fb

Stabilize AtomicN::fetch_min and AtomicN::fetch_max Some architectures (ARMv8.1 LSE and RISC-V) have specific instructions for atomic min/max which the compiler can only generate through explicit instrinsics.

Rollup merge of rust-lang#72452 - Lucretiel:precision-doc, r=dtolnay

a32e584

Clarified the documentation for Formatter::precision Added a note that `precision` is interpreted as max-width when formatting strings

Rollup merge of rust-lang#72547 - alex:patch-1, r=oli-obk

59b6887

Added a codegen test for a recent optimization for overflow-checks=on Closes rust-lang#58692

Rollup merge of rust-lang#72645 - ldm0:mailmap, r=nikomatsakis

08cc539

Add myself to .mailmap

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 28, 2020

JohnTitor added the rollup A PR which is a rollup label May 28, 2020

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 28, 2020

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 28, 2020

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 28, 2020

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 28, 2020

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 May 28, 2020

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 May 28, 2020

Dylan-DPC-zz closed this May 28, 2020

JohnTitor deleted the rollup-uh2cq5p branch May 28, 2020 19:04

tmiasko mentioned this pull request May 29, 2020

Linker invocation failed with: nul byte found in provided data #72744

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #72681

Rollup of 9 pull requests #72681

JohnTitor commented May 28, 2020

JohnTitor commented May 28, 2020

bors commented May 28, 2020

bors commented May 28, 2020

bors commented May 28, 2020

JohnTitor commented May 28, 2020

bors commented May 28, 2020

bors commented May 28, 2020

JohnTitor commented May 28, 2020

Dylan-DPC-zz commented May 28, 2020

Rollup of 9 pull requests #72681

Rollup of 9 pull requests #72681

Conversation

JohnTitor commented May 28, 2020

JohnTitor commented May 28, 2020

bors commented May 28, 2020

bors commented May 28, 2020

bors commented May 28, 2020

JohnTitor commented May 28, 2020

bors commented May 28, 2020

bors commented May 28, 2020

JohnTitor commented May 28, 2020

Dylan-DPC-zz commented May 28, 2020