Rollup of 7 pull requests #94774

matthiaskrgr · 2022-03-09T16:53:27Z

Successful merges:

Make some Clone impls const #91804 (Make some Clone impls const)
Mention intent of From trait in its docs #92541 (Mention intent of From trait in its docs)
Use MaybeUninit in VecDeque to remove the undefined behavior of slice #94472 (Use MaybeUninit in VecDeque to remove the undefined behavior of slice)
Statically compile libstdc++ everywhere if asked #94719 (Statically compile libstdc++ everywhere if asked)
Suggest if let/let_else for refutable pat in let #94739 (Suggest if let/let_else for refutable pat in let)
Warn users about || in let chain expressions #94754 (Warn users about || in let chain expressions)
Add documentation about lifetimes to thread::scope. #94763 (Add documentation about lifetimes to thread::scope.)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

PR rust-lang#93918 made it so that `-static-libstdc++` was only set in one place, and was only set during linking, but accidentally also made it so that it is no longer passed when building LLD or sanitizers, only when building LLVM itself. This moves the logic for setting `-static-libstdc++` in the linker flags back to `configure_cmake` so that it takes effect for all CMake invocations in `native.rs`. As a side-effect, this also causes libstdc++ to be statically compiled into sanitizers and LLD if `llvm-tools-enabled` is set but `llvm-static-stdcpp` is not, even though previously it was only linked statically if `llvm-static-stdcpp` was set explicitly. But that seems more like the expected behavior anyway.

Signed-off-by: JmPotato <ghzpotato@gmail.com>

Make some `Clone` impls `const` Tracking issue: rust-lang#91805 `Clone::clone_from` and some impls (Option, Result) bounded on `~const Drop`. ```rust // core::clone impl const Clone for INTEGER impl const Clone for FLOAT impl const Clone for bool impl const Clone for char impl const Clone for ! impl<T: ?Sized> const Clone for *const T impl<T: ?Sized> const Clone for *mut T impl<T: ?Sized> const Clone for &T // core::option impl<T> const Clone for Option<T> where T: ~const Clone + ~const Drop // core::result impl<T, E> const Clone for Result<T, E> where T: ~const Clone + ~const Drop, E: ~const Clone + ~const Drop, // core::convert impl const Clone for Infallible // core::ptr impl<T: ?Sized> const Clone for NonNull<T> impl<T: ?Sized> const Clone for Unique<T> ```

Mention intent of `From` trait in its docs This pr is a docs modification to add to the documentation of the `From` trait a note about its intent as a perfect conversion. This is already stated in the `TryFrom` docs so this is simply adding that information in a more visible way.

…ue, r=m-ou-se Use MaybeUninit in VecDeque to remove the undefined behavior of slice Signed-off-by: JmPotato <ghzpotato@gmail.com> Ref rust-lang#74189. Adjust the code to follow the [doc.rust-lang.org/reference/behavior-considered-undefined.html](https://doc.rust-lang.org/reference/behavior-considered-undefined.html). * Change the return type of `buffer_as_slice` from `&[T]` to `&[MaybeUninit<T>]`. * Add some corresponding safety comments. Benchmark results: master 8d6f527 ```rust test collections::vec_deque::tests::bench_pop_back_100 ... bench: 47 ns/iter (+/- 1) test collections::vec_deque::tests::bench_pop_front_100 ... bench: 50 ns/iter (+/- 4) test collections::vec_deque::tests::bench_push_back_100 ... bench: 69 ns/iter (+/- 10) test collections::vec_deque::tests::bench_push_front_100 ... bench: 72 ns/iter (+/- 6) test collections::vec_deque::tests::bench_retain_half_10000 ... bench: 145,891 ns/iter (+/- 7,975) test collections::vec_deque::tests::bench_retain_odd_10000 ... bench: 141,647 ns/iter (+/- 3,711) test collections::vec_deque::tests::bench_retain_whole_10000 ... bench: 120,132 ns/iter (+/- 4,078) ``` This PR ```rust test collections::vec_deque::tests::bench_pop_back_100 ... bench: 48 ns/iter (+/- 2) test collections::vec_deque::tests::bench_pop_front_100 ... bench: 51 ns/iter (+/- 3) test collections::vec_deque::tests::bench_push_back_100 ... bench: 73 ns/iter (+/- 2) test collections::vec_deque::tests::bench_push_front_100 ... bench: 73 ns/iter (+/- 2) test collections::vec_deque::tests::bench_retain_half_10000 ... bench: 131,796 ns/iter (+/- 5,440) test collections::vec_deque::tests::bench_retain_odd_10000 ... bench: 137,563 ns/iter (+/- 3,349) test collections::vec_deque::tests::bench_retain_whole_10000 ... bench: 128,815 ns/iter (+/- 3,289) ```

…mulacrum Statically compile libstdc++ everywhere if asked PR rust-lang#93918 made it so that `-static-libstdc++` was only set in one place, and was only set during linking, but accidentally also made it so that it is no longer passed when building LLD, only when building LLVM itself. This moves the logic for setting `-static-libstdc++` in the linker flags to `configure_cmake` so that it takes effect for all CMake invocations in `native.rs`. As a side-effect, this also causes libstdc++ to be statically compiled into sanitizers, whereas previously the `llvm-static-stdcpp` flag had no effect on sanitizers. It also makes it so that LLD will be compiled statically if `llvm-tools-enabled` is set, even though previously it was only linked statically if `llvm-static-stdcpp` was set explicitly. Both of these seem like they match expected behavior than what was there prior to rust-lang#93918.

Suggest `if let`/`let_else` for refutable pat in `let` r? ```@oli-obk```

Warn users about `||` in let chain expressions Or more specifically, warn that `||` operators are forbidden. This PR is simple so I guess anyone can review 🤷 cc rust-lang#53667 cc `@matthewjasper`

…s, r=Mark-Simulacrum Add documentation about lifetimes to thread::scope. This resolves the last unresolved question of rust-lang#93203 This was brought up in rust-lang#94559 (comment) r? ```@Mark-Simulacrum```

matthiaskrgr · 2022-03-09T16:53:46Z

@bors r+ rollup=never p=7

bors · 2022-03-09T16:53:48Z

📌 Commit a35613f has been approved by matthiaskrgr

bors · 2022-03-09T16:59:59Z

⌛ Testing commit a35613f with merge c313db3d2e62f36c5df92e32cb61d54b26579916...

bors · 2022-03-09T17:38:10Z

💔 Test failed - checks-actions

nikic · 2022-03-09T18:43:05Z

/checkout/src/test/rustdoc-gui/mobile.goml mobile... FAILED
Error: (line 27) Error: Evaluation failed: assert didn't fail: for command compare-elements-position-near-false: ("#preferred-light-theme .setting-name", "#preferred-light-theme .choice", {"y": 16})

Same failure in #94764 and #94737, so I think we have a broken baseline.

rust-log-analyzer · 2022-03-09T18:56:02Z

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

test [ui] run-pass/u128.rs ... ok
diff of stdout:

-[2, 2] Iter([2, 2], [])
+[2, 2] Iter([core::mem::maybe_uninit::MaybeUninit<alloc::boxed::Box<i32>>, core::mem::maybe_uninit::MaybeUninit<alloc::boxed::Box<i32>>], [])
 

The actual stdout differed from the expected stdout.
Actual stdout saved to /tmp/compiletestDp9Oan/vecdeque.stage-id.stdout
Actual stdout saved to /tmp/compiletestDp9Oan/vecdeque.stage-id.stdout
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args vecdeque.rs`

error: 1 errors occurred comparing output.
status: exit status: 0
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/vecdeque.rs" "-L" "/tmp/compiletestDp9Oan" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestDp9Oan/vecdeque.stage-id" "-A" "unused" "--edition" "2018" "-Astable-features" "--sysroot" "/home/user/.cache/miri/HOST" "-Zmiri-tag-raw-pointers" "-L" "/tmp/compiletestDp9Oan/vecdeque.stage-id.aux"
------------------------------------------
------------------------------------------
[2, 2] Iter([core::mem::maybe_uninit::MaybeUninit<alloc::boxed::Box<i32>>, core::mem::maybe_uninit::MaybeUninit<alloc::boxed::Box<i32>>], [])

------------------------------------------
stderr:
------------------------------------------
---
.......... (60/61)
.          (61/61)


/checkout/src/test/rustdoc-gui/mobile.goml mobile... FAILED
[ERROR] (line 27) Error: Evaluation failed: assert didn't fail: for command `compare-elements-position-near-false: ("#preferred-light-theme .setting-name", "#preferred-light-theme .choice", {"y": 16})`
Build completed unsuccessfully in 0:00:21

nikic · 2022-03-09T19:32:19Z

@bors treeclosed=50 to avoid more spurious failures

GuillaumeGomez · 2022-03-09T19:45:33Z

Like mentionned in #93784, I'm investigating.

…r=Dylan-DPC Fix spurious CI failures This should fix the CI error encountered in rust-lang#94774 (and multiple others). cc `@nikic`

nikic · 2022-03-09T21:11:31Z

@bors treeclosed- The x86_64-gnu-tools job in #94779 succeeded.

Dylan-DPC · 2022-03-09T21:13:32Z

(for reference, the test was commented out)

Dylan-DPC · 2022-03-09T21:26:26Z

will make a bigger rollup

lilasta and others added 15 commits December 12, 2021 04:19

Make some Clone impls const

6620244

mirror mention of intent of From

9054fbb

Suggest if let/let_else for refutable pat in let

0d92752

Do not suggest let_else if no bindings would be introduced

c3a998e

Use MaybeUninit in VecDeque to remove the undefined behavior of slice

e54d4ab

Signed-off-by: JmPotato <ghzpotato@gmail.com>

Add documentation about lifetimes to thread::scope.

4d56c15

Warn users about || in let chain expressions

c7a5ad0

Rollup merge of rust-lang#94739 - estebank:suggest-let-else, r=oli-obk

cb90a53

Suggest `if let`/`let_else` for refutable pat in `let` r? ```@oli-obk```

Rollup merge of rust-lang#94754 - c410-f3r:nice-error, r=lcnr

944cdfd

Warn users about `||` in let chain expressions Or more specifically, warn that `||` operators are forbidden. This PR is simple so I guess anyone can review 🤷 cc rust-lang#53667 cc `@matthewjasper`

Rollup merge of rust-lang#94763 - m-ou-se:scoped-threads-lifetime-doc…

a35613f

…s, r=Mark-Simulacrum Add documentation about lifetimes to thread::scope. This resolves the last unresolved question of rust-lang#93203 This was brought up in rust-lang#94559 (comment) r? ```@Mark-Simulacrum```

rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 9, 2022

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 9, 2022

lcnr mentioned this pull request Mar 9, 2022

Warn users about || in let chain expressions #94754

Merged

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 Mar 9, 2022

c410-f3r mentioned this pull request Mar 9, 2022

[1/2] Implement macro meta-variable expressions #94368

Merged

GuillaumeGomez mentioned this pull request Mar 9, 2022

Fix spurious CI failures #94779

Merged

bors mentioned this pull request Mar 9, 2022

Add miri to the well known conditional compilation names and values #94772

Merged

Dylan-DPC closed this Mar 9, 2022

matthiaskrgr deleted the rollup-ssp3scf branch March 11, 2022 15:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #94774

Rollup of 7 pull requests #94774

matthiaskrgr commented Mar 9, 2022

matthiaskrgr commented Mar 9, 2022

bors commented Mar 9, 2022

bors commented Mar 9, 2022

bors commented Mar 9, 2022

nikic commented Mar 9, 2022 •

edited

Loading

rust-log-analyzer commented Mar 9, 2022

nikic commented Mar 9, 2022

GuillaumeGomez commented Mar 9, 2022

nikic commented Mar 9, 2022

Dylan-DPC commented Mar 9, 2022

Dylan-DPC commented Mar 9, 2022

Rollup of 7 pull requests #94774

Rollup of 7 pull requests #94774

Conversation

matthiaskrgr commented Mar 9, 2022

matthiaskrgr commented Mar 9, 2022

bors commented Mar 9, 2022

bors commented Mar 9, 2022

bors commented Mar 9, 2022

nikic commented Mar 9, 2022 • edited Loading

rust-log-analyzer commented Mar 9, 2022

nikic commented Mar 9, 2022

GuillaumeGomez commented Mar 9, 2022

nikic commented Mar 9, 2022

Dylan-DPC commented Mar 9, 2022

Dylan-DPC commented Mar 9, 2022

nikic commented Mar 9, 2022 •

edited

Loading