Change text -> rust highlighting in sanitizer.md by tgross35 · Pull Request #108997 · rust-lang/rust

tgross35 · 2023-03-10T18:24:19Z

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 · 2023-03-10T18:24:26Z

r? @JohnTitor

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

tgross35 · 2023-03-10T18:25:59Z

@rustbot label +A-docs

JohnTitor · 2023-03-11T02:14:03Z

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

bors · 2023-03-11T02:14:06Z

📌 Commit e0d9170 has been approved by JohnTitor

It is now in the queue for this repository.

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 · 2023-03-11T11:54:45Z

@bors r- failed in a rollup
#109012
https://github.com/rust-lang-ci/rust/actions/runs/4391950403/jobs/7691424351#step:26:39353

tgross35 · 2023-03-13T16:15:19Z

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 · 2023-03-13T17:09:31Z

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

matthiaskrgr · 2023-03-13T17:52:55Z

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

bors · 2023-03-13T17:52:57Z

📌 Commit e0d9170 has been approved by JohnTitor

It is now in the queue for this repository.

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 · 2023-03-13T20:54:23Z

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-

tgross35 · 2023-03-14T00:52:44Z

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

JohnTitor · 2023-03-16T11:16:31Z

Awesome, thank you!
@bors r+

bors · 2023-03-16T11:16:33Z

📌 Commit 738ea1b has been approved by JohnTitor

It is now in the queue for this repository.

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 · 2023-03-17T00:01:19Z

@bors r- rollup=iffy
https://github.com/rust-lang-ci/rust/actions/runs/4442323184/jobs/7798426942#step:26:27152

tgross35 · 2023-03-17T00:05:35Z

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

matthiaskrgr · 2023-03-17T00:18:35Z

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

JohnTitor · 2023-03-17T13:58:23Z

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

bors · 2023-03-17T13:58:26Z

✌️ @tgross35 can now approve this pull request

Marked ignore due to difficulty getting doctests to pass cross-platform

tgross35 · 2023-03-22T05:50:11Z

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 · 2023-03-22T05:50:13Z

📌 Commit df034b0 has been approved by JohnTitor

It is now in the queue for this repository.

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

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

rustbot assigned JohnTitor Mar 10, 2023

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 10, 2023

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 approved these changes Mar 11, 2023
View reviewed changes

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 mentioned this pull request Mar 11, 2023
Rollup of 10 pull requests #109012
Closed

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

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 mentioned this pull request Mar 13, 2023
Rollup of 8 pull requests #109086
Closed

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 force-pushed the patch-1 branch from e0d9170 to 5dfeaa6Compare March 15, 2023 06:23

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 mentioned this pull request Mar 16, 2023
Rollup of 9 pull requests #109230
Closed

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 force-pushed the patch-1 branch from 738ea1b to 33ba9fdCompare March 22, 2023 05:07

Change text -> rust,ignore highlighting in sanitizer.md
df034b0
Marked ignore due to difficulty getting doctests to pass cross-platform

tgross35 force-pushed the patch-1 branch from 33ba9fd to df034b0Compare March 22, 2023 05:11

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 mentioned this pull request Mar 22, 2023
Rollup of 12 pull requests #109490
Closed

Dylan-DPC mentioned this pull request Mar 22, 2023
Rollup of 11 pull requests #109496
Merged

bors merged commit 59d9cbf into rust-lang:masterMar 22, 2023

rustbot added this to the 1.70.0 milestone Mar 22, 2023

tgross35 deleted the patch-1 branch March 22, 2023 21:38

Uh oh!

Uh oh!

Conversation

tgross35 commented Mar 10, 2023

Uh oh!

rustbot commented Mar 10, 2023

Uh oh!

tgross35 commented Mar 10, 2023

Uh oh!

JohnTitor commented Mar 11, 2023

Uh oh!

bors commented Mar 11, 2023

Uh oh!

matthiaskrgr commented Mar 11, 2023

Uh oh!

tgross35 commented Mar 13, 2023

Uh oh!

JohnTitor commented Mar 13, 2023

Uh oh!

matthiaskrgr commented Mar 13, 2023

Uh oh!

bors commented Mar 13, 2023

Uh oh!

matthiaskrgr commented Mar 13, 2023

Uh oh!

tgross35 commented Mar 14, 2023

Uh oh!

JohnTitor commented Mar 16, 2023

Uh oh!

bors commented Mar 16, 2023

Uh oh!

matthiaskrgr commented Mar 17, 2023

Uh oh!

tgross35 commented Mar 17, 2023

Uh oh!

matthiaskrgr commented Mar 17, 2023

Uh oh!

JohnTitor commented Mar 17, 2023

Uh oh!

bors commented Mar 17, 2023

Uh oh!

tgross35 commented Mar 22, 2023

Uh oh!

bors commented Mar 22, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants