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

Change text -> rust highlighting in sanitizer.md #108997

Merged
merged 1 commit into from
Mar 22, 2023

Conversation

tgross35
Copy link
Contributor

Not sure why this has syntax highlighting turned off, but it doesn't need to be

Relevant page: https://doc.rust-lang.org/beta/unstable-book/compiler-flags/sanitizer.html

@rustbot
Copy link
Collaborator

rustbot commented Mar 10, 2023

r? @JohnTitor

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 10, 2023
@tgross35
Copy link
Contributor Author

@rustbot label +A-docs

@rustbot rustbot added the A-docs Area: documentation for any part of the project, including the compiler, standard library, and tools label Mar 10, 2023
@JohnTitor
Copy link
Member

Good catch, thanks! Maybe a copy/paste error?
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 11, 2023

📌 Commit e0d9170 has been approved by JohnTitor

It is now in the queue for this repository.

@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 Mar 11, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 11, 2023
Change text -> rust highlighting in sanitizer.md

Not sure why this has syntax highlighting turned off, but it doesn't need to be

Relevant page: https://doc.rust-lang.org/beta/unstable-book/compiler-flags/sanitizer.html
@matthiaskrgr
Copy link
Member

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 11, 2023
@tgross35
Copy link
Contributor Author

I'm a bit confused - the rollup failure looks like a curl issue downloading llvm? I can't see this PR making a difference there

@JohnTitor
Copy link
Member

Yeah, this just changes the annotation on the unstable book, @matthiaskrgr why do you think it's related?

@matthiaskrgr
Copy link
Member

Ah sorry, my bad, let's retry then 🙂
@bors r=JohnTitor

@bors
Copy link
Contributor

bors commented Mar 13, 2023

📌 Commit e0d9170 has been approved by JohnTitor

It is now in the queue for this repository.

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 13, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 13, 2023
Change text -> rust highlighting in sanitizer.md

Not sure why this has syntax highlighting turned off, but it doesn't need to be

Relevant page: https://doc.rust-lang.org/beta/unstable-book/compiler-flags/sanitizer.html
@matthiaskrgr
Copy link
Member

Ah sorry, still failing. Apparently I linked the wrong stacktrace


failures:

---- /checkout/src/doc/unstable-book/src/compiler-flags/sanitizer.md - ControlFlowIntegrity::Example (line 216) stdout ----
error: register %rax is only available in 64-bit mode
  --> /checkout/src/doc/unstable-book/src/compiler-flags/sanitizer.md:241:14
   |
26 |              lea rax, [rdi+2]
   |              ^
   |
note: instantiated into assembly here
  --> <inline asm>:12:18
   |
12 |              lea rax, [rdi+2]
   |                  ^^^

error: register %rdi is only available in 64-bit mode
  --> /checkout/src/doc/unstable-book/src/compiler-flags/sanitizer.md:241:14
   |
26 |              lea rax, [rdi+2]
   |              ^
   |
note: instantiated into assembly here
  --> <inline asm>:12:24
   |
12 |              lea rax, [rdi+2]
   |                        ^^^

error: aborting due to 2 previous errors

Couldn't compile the test.

failures:
    /checkout/src/doc/unstable-book/src/compiler-flags/sanitizer.md - 

https://github.com/rust-lang-ci/rust/actions/runs/4409005246/jobs/7724759124

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 13, 2023
@tgross35
Copy link
Contributor Author

Oh whoops, thanks for pointing that out. I'll update this in a minute

@JohnTitor
Copy link
Member

Awesome, thank you!
@bors r+

@bors
Copy link
Contributor

bors commented Mar 16, 2023

📌 Commit 738ea1b has been approved by JohnTitor

It is now in the queue for this repository.

@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 Mar 16, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 16, 2023
Change text -> rust highlighting in sanitizer.md

Not sure why this has syntax highlighting turned off, but it doesn't need to be

Relevant page: https://doc.rust-lang.org/beta/unstable-book/compiler-flags/sanitizer.html
@matthiaskrgr
Copy link
Member

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 17, 2023
@tgross35
Copy link
Contributor Author

Wow, didn’t expect this tiny PR to be that annoying. I’ll just mark the doctest ignore when I get the chance.

@matthiaskrgr
Copy link
Member

well, you may have found the reason why the highlighting was turned off 🙃

@JohnTitor
Copy link
Member

What a complicated world assembly is! r=me once it's fixed, @bors delegate+

@bors
Copy link
Contributor

bors commented Mar 17, 2023

✌️ @tgross35 can now approve this pull request

Marked ignore due to difficulty getting doctests to pass cross-platform
@tgross35
Copy link
Contributor Author

Thanks for the power, but I can't figure out a good way to get the output tests to work cross-platform. So I'll just mark it ignore and call it a day :)

@bors r=JohnTitor rollup

@bors
Copy link
Contributor

bors commented Mar 22, 2023

📌 Commit df034b0 has been approved by JohnTitor

It is now in the queue for this repository.

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 22, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 22, 2023
Change text -> rust highlighting in sanitizer.md

Not sure why this has syntax highlighting turned off, but it doesn't need to be

Relevant page: https://doc.rust-lang.org/beta/unstable-book/compiler-flags/sanitizer.html
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 22, 2023
Rollup of 11 pull requests

Successful merges:

 - rust-lang#100311 (Fix handling of trailing bare CR in str::lines)
 - rust-lang#108997 (Change text -> rust highlighting in sanitizer.md)
 - rust-lang#109179 (move Option::as_slice to intrinsic)
 - rust-lang#109187 (Render source page layout with Askama)
 - rust-lang#109280 (Remove `VecMap`)
 - rust-lang#109295 (refactor `fn bootstrap::builder::Builder::compiler_for` logic)
 - rust-lang#109312 (rustdoc: Cleanup parent module tracking for doc links)
 - rust-lang#109317 (Update links for custom discriminants.)
 - rust-lang#109405 (RPITITs are `DefKind::Opaque` with new lowering strategy)
 - rust-lang#109414 (Do not consider synthesized RPITITs on missing items checks)
 - rust-lang#109435 (Detect uninhabited types early in const eval)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 59d9cbf into rust-lang:master Mar 22, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 22, 2023
@tgross35 tgross35 deleted the patch-1 branch March 22, 2023 21:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-docs Area: documentation for any part of the project, including the compiler, standard library, and tools 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.

5 participants