Rollup of 10 pull requests #99564

matthiaskrgr · 2022-07-21T16:02:44Z

Successful merges:

Add special_module_name lint #94467 (Add special_module_name lint)
std: use futex-based locks on Fuchsia #98707 (std: use futex-based locks on Fuchsia)
Add PhantomData marker for dropck to BTreeMap #99413 (Add PhantomData marker for dropck to BTreeMap)
Add map_continue and continue_value combinators to ControlFlow #99454 (Add map_continue and continue_value combinators to ControlFlow)
Fix the stable version of AsFd for Arc<T> and Box<T> #99523 (Fix the stable version of AsFd for Arc<T> and Box<T>)
couple of clippy::perf fixes #99528 (couple of clippy::perf fixes)
Add regression test for #52304 #99549 (Add regression test for Compiler panic on type inference for impl Generator yielding a reference #52304)
Edit rustc_index::vec::IndexVec::pick3_mut docs #99557 (Edit rustc_index::vec::IndexVec::pick3_mut docs)
Fix remap_constness #99558 (Fix remap_constness)
Remove unused field in ItemKind::KeywordItem #99559 (Remove unused field in ItemKind::KeywordItem)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

closes rust-lang#99408

These merged in rust-lang#97437 for 1.64.0, apart from the main `io_safety` feature that stabilized in 1.63.0.

Fix type error Fix continue_value doc comment

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

Clarify when this method will panic. Also fix formatting for `pick2_mut`.

`~const Drop` was renamed to `~const Destruct` and this special case should be removed

Add `special_module_name` lint Declaring `lib` as a module is one of the most common beginner mistakes when trying to setup a binary and library target in the same crate. `special_module_name` lints against it, as well as `mod main;` ``` warning: found module declaration for main.rs --> $DIR/special_module_name.rs:4:1 | LL | mod main; | ^^^^^^^^^ | = note: a binary crate cannot be used as library warning: found module declaration for lib.rs --> $DIR/special_module_name.rs:1:1 | LL | mod lib; | ^^^^^^^^ | = note: `#[warn(special_module_name)]` on by default = note: lib.rs is the root of this crate's library target = help: to refer to it from other targets, use the library's name as the path ``` Note that the help message is not the best in that it doesn't provide an example of an import path (`the_actual_crate_name::`), and doesn't check whether the current file is part of a library/binary target to provide more specific error messages. I'm not sure where this lint would have to be run to access that information.

std: use futex-based locks on Fuchsia This switches `Condvar` and `RwLock` to the futex-based implementation currently used on Linux and some BSDs. Additionally, `Mutex` now has its own, priority-inheriting implementation based on the mutex in Fuchsia's `libsync`. It differs from the original in that it panics instead of aborting when reentrant locking is detected. ```@rustbot``` ping fuchsia r? ```@m-ou-se```

Add `PhantomData` marker for dropck to `BTreeMap` closes rust-lang#99408

…inators, r=scottmcm Add map_continue and continue_value combinators to ControlFlow As suggested in this comment: rust-lang#75744 (comment) Related tracking issue: rust-lang#75744 r? `````@scottmcm`````

Fix the stable version of `AsFd for Arc<T>` and `Box<T>` These merged in rust-lang#97437 for 1.64.0, apart from the main `io_safety` feature that stabilized in 1.63.0.

couple of clippy::perf fixes

…rrors Add regression test for rust-lang#52304 Closes rust-lang#52304 r? ``@compiler-errors`` Signed-off-by: Yuki Okushi <jtitor@2k36.org>

Edit `rustc_index::vec::IndexVec::pick3_mut` docs Clarify when this method will panic. Part of rust-lang#93792.

…ix, r=oli-obk Fix `remap_constness` `~const Drop` was renamed to `~const Destruct` and this special case should be removed

…ord, r=notriddle Remove unused field in ItemKind::KeywordItem For the keyword name, we use `Item::name` directly everywhere so there is no point into keeping it. r? `@notriddle`

matthiaskrgr · 2022-07-21T16:04:15Z

@bors r+ rollup=never p=10

bors · 2022-07-21T16:04:17Z

📌 Commit ded3594 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-07-21T16:21:22Z

⌛ Testing commit ded3594 with merge 6dd33a5f4736092c95d111945213a5b1e634669f...

bors · 2022-07-21T16:38:20Z

💔 Test failed - checks-actions

rust-log-analyzer · 2022-07-21T17:48:22Z

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

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

normalized stderr:
warning: found module declaration for lib.rs
  --> $DIR/issue-97007.rs:6:1
   |
LL | / mod lib {
LL | |     const N_ISLANDS: usize = 4;
LL | |     const N_BRIDGES: usize = 7;
LL | |     const BRIDGES: [(usize, usize); 7] = [(0, 1), (0, 1), (0, 2), (0, 3), (0, 3), (1, 2), (2, 3)];
LL | |     }
LL | | }
   | |_^
   |
   |
   = note: `#[warn(special_module_name)]` on by default
   = note: lib.rs is the root of this crate's library target
   = help: to refer to it from other targets, use the library's name as the path
Some tests failed in compiletest suite=ui mode=ui host=x86_64-unknown-linux-gnu target=x86_64-unknown-linux-gnu
warning: 1 warning emitted


---
To only update this specific test, also pass `--test-args const-generics/issue-97007.rs`

error: 1 errors occurred comparing output.
status: exit status: 0
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/const-generics/issue-97007.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/issue-97007" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/issue-97007/auxiliary"
stdout: none
--- stderr -------------------------------
  --> /checkout/src/test/ui/const-generics/issue-97007.rs:6:1
   |
LL | / mod lib {
LL | / mod lib {
LL | |     const N_ISLANDS: usize = 4;
LL | |     const N_BRIDGES: usize = 7;
LL | |     const BRIDGES: [(usize, usize); 7] = [(0, 1), (0, 1), (0, 2), (0, 3), (0, 3), (1, 2), (2, 3)];
LL | |     }
LL | | }
   | |_^
   |
   |
   = note: `#[warn(special_module_name)]` on by default
   = note: lib.rs is the root of this crate's library target
   = help: to refer to it from other targets, use the library's name as the path
warning: 1 warning emitted
------------------------------------------

rust-log-analyzer · 2022-07-21T17:58:15Z

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

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

normalized stderr:
warning: found module declaration for lib.rs
  --> $DIR/issue-97007.rs:6:1
   |
LL | / mod lib {
LL | |     const N_ISLANDS: usize = 4;
LL | |     const N_BRIDGES: usize = 7;
LL | |     const BRIDGES: [(usize, usize); 7] = [(0, 1), (0, 1), (0, 2), (0, 3), (0, 3), (1, 2), (2, 3)];
LL | |     }
LL | | }
   | |_^
   |
   |
   = note: `#[warn(special_module_name)]` on by default
   = note: lib.rs is the root of this crate's library target
   = help: to refer to it from other targets, use the library's name as the path
warning: 1 warning emitted



---
To only update this specific test, also pass `--test-args const-generics/issue-97007.rs`

error: 1 errors occurred comparing output.
status: exit status: 0
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/const-generics/issue-97007.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/issue-97007" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/issue-97007/auxiliary"
stdout: none
--- stderr -------------------------------
  --> /checkout/src/test/ui/const-generics/issue-97007.rs:6:1
   |
LL | / mod lib {
LL | / mod lib {
LL | |     const N_ISLANDS: usize = 4;
LL | |     const N_BRIDGES: usize = 7;
LL | |     const BRIDGES: [(usize, usize); 7] = [(0, 1), (0, 1), (0, 2), (0, 3), (0, 3), (1, 2), (2, 3)];
LL | |     }
LL | | }
   | |_^
   |
   |
   = note: `#[warn(special_module_name)]` on by default
   = note: lib.rs is the root of this crate's library target
   = help: to refer to it from other targets, use the library's name as the path
warning: 1 warning emitted
------------------------------------------

ibraheemdev and others added 26 commits February 28, 2022 20:10

add special_module_name lint

4dded23

tidy

c08f460

move dummy test module to auxiliary directory

f479289

std: use futex-based locks on Fuchsia

f7ae92c

std: fix issue with perma-locked mutexes on Fuchsia

0d91b08

std: panic instead of deadlocking in mutex implementation on Fuchsia

f357926

Add PhantomData marker for dropck to BTreeMap

110fdb6

closes rust-lang#99408

clippy::perf fixes

611bbcb

owner is not micro (correct typo)

c72a77e

Fix the stable version of AsFd for Arc<T> and Box<T>

bd0474d

These merged in rust-lang#97437 for 1.64.0, apart from the main `io_safety` feature that stabilized in 1.63.0.

Add map_continue and continue_value combinators to ControlFlow

1993a5f

Fix type error Fix continue_value doc comment

Add regression test for rust-lang#52304

5249183

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

remove unused import

8ba02f1

Edit rustc_index::vec::IndexVec::pick3_mut docs

aad1aa3

Clarify when this method will panic. Also fix formatting for `pick2_mut`.

Fix remap_constness

b7de175

`~const Drop` was renamed to `~const Destruct` and this special case should be removed

Remove unused field in ItemKind::KeywordItem

8e15081

Rollup merge of rust-lang#99413 - steffahn:btree_dropck, r=m-ou-se

b041143

Add `PhantomData` marker for dropck to `BTreeMap` closes rust-lang#99408

Rollup merge of rust-lang#99454 - benluelo:control-flow/continue-comb…

eb0a25f

…inators, r=scottmcm Add map_continue and continue_value combinators to ControlFlow As suggested in this comment: rust-lang#75744 (comment) Related tracking issue: rust-lang#75744 r? `````@scottmcm`````

Rollup merge of rust-lang#99523 - cuviper:asfd_ptrs-1.64, r=jyn514

a9ab1d4

Fix the stable version of `AsFd for Arc<T>` and `Box<T>` These merged in rust-lang#97437 for 1.64.0, apart from the main `io_safety` feature that stabilized in 1.63.0.

Rollup merge of rust-lang#99528 - matthiaskrgr:2022_07_perf, r=estebank

ec8f0dd

couple of clippy::perf fixes

Rollup merge of rust-lang#99549 - JohnTitor:issue-52304, r=compiler-e…

e44326e

…rrors Add regression test for rust-lang#52304 Closes rust-lang#52304 r? ``@compiler-errors`` Signed-off-by: Yuki Okushi <jtitor@2k36.org>

Rollup merge of rust-lang#99557 - pierwill:patch-6, r=tmiasko

0a1b6ed

Edit `rustc_index::vec::IndexVec::pick3_mut` docs Clarify when this method will panic. Part of rust-lang#93792.

Rollup merge of rust-lang#99558 - fee1-dead-contrib:remap_constness_f…

843d204

…ix, r=oli-obk Fix `remap_constness` `~const Drop` was renamed to `~const Destruct` and this special case should be removed

Rollup merge of rust-lang#99559 - GuillaumeGomez:rm-unused-field-keyw…

ded3594

…ord, r=notriddle Remove unused field in ItemKind::KeywordItem For the keyword name, we use `Item::name` directly everywhere so there is no point into keeping it. r? `@notriddle`

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

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 Jul 21, 2022

matthiaskrgr closed this Jul 21, 2022

matthiaskrgr deleted the rollup-q4c6m9h branch July 30, 2022 10:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 10 pull requests #99564

Rollup of 10 pull requests #99564

Uh oh!

matthiaskrgr commented Jul 21, 2022

Uh oh!

matthiaskrgr commented Jul 21, 2022

Uh oh!

bors commented Jul 21, 2022

Uh oh!

bors commented Jul 21, 2022

Uh oh!

bors commented Jul 21, 2022

Uh oh!

rust-log-analyzer commented Jul 21, 2022

Uh oh!

rust-log-analyzer commented Jul 21, 2022

Uh oh!

Uh oh!

Rollup of 10 pull requests #99564

Rollup of 10 pull requests #99564

Uh oh!

Conversation

matthiaskrgr commented Jul 21, 2022

Uh oh!

matthiaskrgr commented Jul 21, 2022

Uh oh!

bors commented Jul 21, 2022

Uh oh!

bors commented Jul 21, 2022

Uh oh!

bors commented Jul 21, 2022

Uh oh!

rust-log-analyzer commented Jul 21, 2022

Uh oh!

rust-log-analyzer commented Jul 21, 2022

Uh oh!

Uh oh!