Skip to content
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

Rollup of 5 pull requests #101372

Closed
wants to merge 12 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

nikic and others added 12 commits August 31, 2022 13:18
Add a test to make that the failure condition for this pattern is
optimized away.

Fixes rust-lang#98294.
It was added with e08a84a
(actually, it was called `.methods > .stability` at the time) and was
directly nested that way.

But with the switch to `<details>`, the code has changed drastically out from
under it, to the point where you have to go out of your way to actually get
it to render this way, and the result looks overly-tight and weird alongside
the normal version where this code is not reachable.
In the future,`ffx component run` will not default to the using the `/core/ffx-laboratory` collection. Updated the run commands to include this.
Add test for rust-lang#98294

Add a test to make that the failure condition for this pattern is optimized away.

Fixes rust-lang#98294.
…ity, r=notriddle

rustdoc: remove old CSS selector that causes weird spacing

It was added with e08a84a (actually, it was called `.methods > .stability` at the time) and was directly nested that way.

**EDIT**: It is technically reachable code still, but it seems wrong.

## With the old CSS rule still present

https://notriddle.com/notriddle-rustdoc-test/weird-spacing/lib/struct.Foo.html

![image](https://user-images.githubusercontent.com/1593513/188216226-c667c560-d33d-494f-a492-4e0ec3ac0009.png)

## Version 2 (an older version of this PR)

https://notriddle.com/notriddle-rustdoc-test/normal-spacing-2/lib/struct.Foo.html

![image](https://user-images.githubusercontent.com/1593513/188216418-9fcd3109-f1b2-425d-b4fc-0c6b3b54e48e.png)

## Version 3 (with alignment fix for mobile)

https://notriddle.com/notriddle-rustdoc-test/normal-spacing-3/lib/struct.Foo.html

![image](https://user-images.githubusercontent.com/1593513/188223161-0e1ebce7-842f-41cb-8a0c-ae43aedcfccc.png)
ffx component run should provide a collection

In the future,`ffx component run` will not default to the using the `/core/ffx-laboratory` collection. Updated the run commands to include this.
…ns, r=wesleywiser

Shrink suggestion span of argument mismatch error

This doesn't really help with rust-lang#101242, but I wanted to put this up while I work on other fixes.
@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 3, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Sep 3, 2022

📌 Commit 39c16eb has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 3, 2022
@bors
Copy link
Contributor

bors commented Sep 3, 2022

⌛ Testing commit 39c16eb with merge cf7becca72f13b85b27ebcee030153f9e14e5d1c...

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
Some tests failed in compiletest suite=codegen mode=codegen host=x86_64-unknown-linux-gnu target=x86_64-unknown-linux-gnu

failures:

---- [codegen] src/test/codegen/issue-98294-get-mut-copy-from-slice-opt.rs stdout ----

error: verification with 'FileCheck' failed
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm/bin/FileCheck" "--input-file" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/issue-98294-get-mut-copy-from-slice-opt/issue-98294-get-mut-copy-from-slice-opt.ll" "/checkout/src/test/codegen/issue-98294-get-mut-copy-from-slice-opt.rs" "--allow-unused-prefixes" "--check-prefixes" "CHECK,NONMSVC"
stdout: none
--- stderr -------------------------------
/checkout/src/test/codegen/issue-98294-get-mut-copy-from-slice-opt.rs:11:16: error: CHECK-NOT: excluded string found in input
 // CHECK-NOT: call
               ^
/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/issue-98294-get-mut-copy-from-slice-opt/issue-98294-get-mut-copy-from-slice-opt.ll:29:7: note: found here
 tail call void @llvm.trap(), !noalias !2


Input file: /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/issue-98294-get-mut-copy-from-slice-opt/issue-98294-get-mut-copy-from-slice-opt.ll
Check file: /checkout/src/test/codegen/issue-98294-get-mut-copy-from-slice-opt.rs

-dump-input=help explains the following input dump.
Input was:
<<<<<<
        .
        .
        .
        .
       24:  %diff.0.i.i.i.i.i = select i1 %_13.i.i.i.i.i, i64 %_18.0.i.i.i.i.i, i64 %_21.0.i.i.i.i.i 
       25:  %.not.i.i.i.i = icmp ult i64 %diff.0.i.i.i.i.i, %.sroa.3.0.i 
       26:  br i1 %.not.i.i.i.i, label %bb10.i.i.i.i, label %"_ZN4core5slice29_$LT$impl$u20$$u5b$T$u5d$$GT$15copy_from_slice17hdf5e891f94371aebE.exit" 
       27:  
       28: bb10.i.i.i.i: ; preds = %bb2.i.i.i.i 
       29:  tail call void @llvm.trap(), !noalias !2 
not:11           !~~~                                 error: no match expected
       30:  unreachable 
       31:  
       32: "_ZN4core5slice29_$LT$impl$u20$$u5b$T$u5d$$GT$15copy_from_slice17hdf5e891f94371aebE.exit": ; preds = %bb2.i.i.i.i 
       33:  tail call void @llvm.memcpy.p0.p0.i64(ptr nonnull align 1 %.sroa.0.0.i, ptr nonnull align 1 %bytes.0, i64 %.sroa.3.0.i, i1 false), !alias.scope !9 
       34:  br label %bb3 
        .
        .
>>>>>>
------------------------------------------

@bors
Copy link
Contributor

bors commented Sep 3, 2022

💔 Test failed - checks-actions

@bors 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 Sep 3, 2022
@matthiaskrgr matthiaskrgr deleted the rollup-ufebpyi branch October 9, 2022 00:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustdoc-json Area: Rustdoc JSON backend rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants