Skip to content

Conversation

Folyd
Copy link
Contributor

@Folyd Folyd commented May 3, 2022

Part of #93058.

r? @GuillaumeGomez

@rustbot rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label May 3, 2022
@rust-highfive
Copy link
Contributor

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez,@Folyd,@jsha

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 3, 2022
@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented May 3, 2022

☔ The latest upstream changes (presumably #96663) made this pull request unmergeable. Please resolve the merge conflicts.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez
Copy link
Member

Looks good to me! Please squash your commits (take a look here if you don't know how) and then I'll approve it.

Fix lint

Fix main.js

Restore anonymous functions

Fix

Fix more
@Folyd
Copy link
Contributor Author

Folyd commented May 4, 2022

Looks good to me! Please squash your commits (take a look here if you don't know how) and then I'll approve it.

Squash done. Thanks, @GuillaumeGomez. 👍

@GuillaumeGomez
Copy link
Member

Thanks!

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented May 4, 2022

📌 Commit 67ebeea has been approved by GuillaumeGomez

@bors 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 4, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request May 5, 2022
Rollup of 7 pull requests

Successful merges:

 - rust-lang#96603 (Enable full revision in const generics ui tests)
 - rust-lang#96616 (Relax memory ordering used in `min_stack`)
 - rust-lang#96619 (Relax memory ordering used in SameMutexCheck)
 - rust-lang#96628 (Stabilize `bool::then_some`)
 - rust-lang#96658 (Move callback to the () => {} syntax.)
 - rust-lang#96677 (Add more tests for label-break-value)
 - rust-lang#96697 (Enable tracing for all queries)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3170321 into rust-lang:master May 5, 2022
@rustbot rustbot added this to the 1.62.0 milestone May 5, 2022
@Folyd Folyd deleted the es6 branch May 5, 2022 05:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.

6 participants