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

Fix regex replacement in theme detection #64096

Merged
merged 1 commit into from Sep 8, 2019

Conversation

GuillaumeGomez
Copy link
Member

Fixes #64061.

This is sadly a lot of bad luck: after making the changes and re-build the docs, I just forgot to force reload the page. Hence having the old (working) version with two replacements instead of the failing regex. Sorry again about that...

cc @fenhl
r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 2, 2019

📌 Commit 991f436 has been approved by Mark-Simulacrum

@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 2, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 3, 2019
…ark-Simulacrum

Fix regex replacement in theme detection

Fixes rust-lang#64061.

This is sadly a lot of bad luck: after making the changes and re-build the docs, I just forgot to force reload the page. Hence having the old (working) version with two replacements instead of the failing regex. Sorry again about that...

cc @fenhl
r? @Mark-Simulacrum
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Sep 6, 2019
…ark-Simulacrum

Fix regex replacement in theme detection

Fixes rust-lang#64061.

This is sadly a lot of bad luck: after making the changes and re-build the docs, I just forgot to force reload the page. Hence having the old (working) version with two replacements instead of the failing regex. Sorry again about that...

cc @fenhl
r? @Mark-Simulacrum
Centril added a commit to Centril/rust that referenced this pull request Sep 6, 2019
…ark-Simulacrum

Fix regex replacement in theme detection

Fixes rust-lang#64061.

This is sadly a lot of bad luck: after making the changes and re-build the docs, I just forgot to force reload the page. Hence having the old (working) version with two replacements instead of the failing regex. Sorry again about that...

cc @fenhl
r? @Mark-Simulacrum
bors added a commit that referenced this pull request Sep 6, 2019
Rollup of 9 pull requests

Successful merges:

 - #64067 (Remove no-prefer-dynamic from valgrind tests)
 - #64078 (compiletest: disable -Aunused for run-pass tests)
 - #64096 (Fix regex replacement in theme detection)
 - #64098 (Ensure edition lints and internal lints are enabled with deny-warnings=false)
 - #64166 (Better way of conditioning the sanitizer builds)
 - #64189 (annotate-snippet emitter: Deal with multispans from macros, too)
 - #64202 (Fixed grammar/style in some error messages)
 - #64206 (annotate-snippet emitter: Update an issue number)
 - #64208 (it's more pythonic to use 'is not None' in python files)

Failed merges:

r? @ghost
@Centril
Copy link
Contributor

Centril commented Sep 7, 2019

@bors rollup-

@bors
Copy link
Contributor

bors commented Sep 8, 2019

⌛ Testing commit 991f436 with merge 5036237...

bors added a commit that referenced this pull request Sep 8, 2019
Fix regex replacement in theme detection

Fixes #64061.

This is sadly a lot of bad luck: after making the changes and re-build the docs, I just forgot to force reload the page. Hence having the old (working) version with two replacements instead of the failing regex. Sorry again about that...

cc @fenhl
r? @Mark-Simulacrum
@bors
Copy link
Contributor

bors commented Sep 8, 2019

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing 5036237 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 8, 2019
@bors bors merged commit 991f436 into rust-lang:master Sep 8, 2019
@GuillaumeGomez GuillaumeGomez deleted the theme-regex-fix branch September 9, 2019 08:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

Automatic dark theme still doesn't work
4 participants