Skip to content

Fix search result colors #87085

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 4 commits into from
Jul 14, 2021
Merged

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Jul 12, 2021

Part of #87072 (fixes the first and fourth regressions and add tests to prevent it from happening again).

cc @Nemo157

r? @camelid

@rust-highfive
Copy link
Contributor

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 12, 2021
@GuillaumeGomez GuillaumeGomez force-pushed the search-result-colors branch 2 times, most recently from ff700ce to dc5db5c Compare July 12, 2021 15:51
@bors
Copy link
Collaborator

bors commented Jul 13, 2021

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

@GuillaumeGomez
Copy link
Member Author

r? @notriddle

@GuillaumeGomez
Copy link
Member Author

@bors: r=notriddle

@bors
Copy link
Collaborator

bors commented Jul 13, 2021

📌 Commit b8264a8 has been approved by notriddle

@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 Jul 13, 2021
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 13, 2021
…, r=notriddle

Search result colors

Part of  rust-lang#87072 (fixes the first and fourth regressions and add tests to prevent it from happening again).

cc `@Nemo157`

r? `@camelid`
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 13, 2021
…, r=notriddle

Search result colors

Part of  rust-lang#87072 (fixes the first and fourth regressions and add tests to prevent it from happening again).

cc ``@Nemo157``

r? ``@camelid``
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 13, 2021
…, r=notriddle

Search result colors

Part of  rust-lang#87072 (fixes the first and fourth regressions and add tests to prevent it from happening again).

cc ```@Nemo157```

r? ```@camelid```
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 14, 2021
Rollup of 6 pull requests

Successful merges:

 - rust-lang#87085 (Search result colors)
 - rust-lang#87090 (Make BTreeSet::split_off name elements like other set methods do)
 - rust-lang#87098 (Unignore some pretty printing tests)
 - rust-lang#87099 (Upgrade `cc` crate to 1.0.69)
 - rust-lang#87101 (Suggest a path separator if a stray colon is found in a match arm)
 - rust-lang#87102 (Add GUI test for "go to first" feature)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fc488d4 into rust-lang:master Jul 14, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 14, 2021
@GuillaumeGomez GuillaumeGomez deleted the search-result-colors branch July 14, 2021 17:46
@GuillaumeGomez GuillaumeGomez changed the title Search result colors Fix search result colors Jul 21, 2021
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: 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.

6 participants