Skip to content

Rollup of 4 pull requests - #85156

Merged
bors merged 9 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-8u4h34g
May 10, 2021
Merged

Rollup of 4 pull requests#85156
bors merged 9 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-8u4h34g

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

jyn514and others added 9 commits April 23, 2021 09:57
Previously, they disagreed about what types were primitives.
This also fixes a bug where rustdoc would mark any type with a reference
as a primitive.
With this the concerns expressed in rust-lang#83800 should be addressed.
rustdoc: Implement `is_primitive` in terms of `primitive_type()`
Previously, they disagreed about what types were primitives.
r? `@GuillaumeGomez`
…o157
Use an SVG image for clipboard instead of unicode character
Linked to rust-lang/docs.rs#1394.
cc `@jsha`
r? `@Nemo157`
…ber, r=jsha
Fix source code line number display and make it clickable again
Fixesrust-lang#85119.
I used the same logic we're using for other codeblocks: putting the line number `<span>`s into the `example-wrap` directly and then add `display: inline-flex` on `example-wrap`.
r? `@jsha`
…k-Simulacrum
Adjust target search algorithm for rustlib path
With this the concerns expressed in rust-lang#83800 should be addressed.
r? `@Mark-Simulacrum`
@rustbotrustbot added the rollup A PR which is a rollup label May 10, 2021
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: r+ p=4 rollup=never

@bors

bors commented May 10, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 6ec1de7 has been approved by GuillaumeGomez

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 10, 2021
@bors

bors commented May 10, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 6ec1de7 with merge 6fd7a6d...

@bors

bors commented May 10, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 6fd7a6d to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 10, 2021
@bors
bors merged commit 6fd7a6d into rust-lang:masterMay 10, 2021
@rustbotrustbot added this to the 1.54.0 milestone May 10, 2021
@GuillaumeGomez
GuillaumeGomez deleted the rollup-8u4h34g branch May 10, 2021 21:12
This was referenced May 10, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@GuillaumeGomez@bors@rustbot@jyn514@nagisa