Skip to content

rustdoc: Fix Managarm C Library name in cfg pretty printer#155408

Merged
rust-bors[bot] merged 3 commits intorust-lang:mainfrom
teor2345:rustdoc-env-names
Apr 24, 2026
Merged

rustdoc: Fix Managarm C Library name in cfg pretty printer#155408
rust-bors[bot] merged 3 commits intorust-lang:mainfrom
teor2345:rustdoc-env-names

Conversation

@teor2345
Copy link
Copy Markdown
Contributor

@teor2345 teor2345 commented Apr 16, 2026

Like #155293, this was introduced in #154328.

Unlike that PR, I don't think there's any need to backport, because this cfg is not used anywhere in the standard library.
(I searched for "mlibc", the only place it's used in rust-lang/rust is the HTML doc test.)

Other Minor Fixes

Remove a FIXME comment in the pretty printer, os = "none" is always bare metal:

"`unknown` os can only be used on particular targets; use `none` for bare-metal targets"

Fix a comment typo, ignore another typo in vendored sources.

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 16, 2026

These commits modify compiler targets.
(See the Target Tier Policy.)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Apr 16, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 16, 2026

r? @lolbinarycat

rustbot has assigned @lolbinarycat.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: rustdoc
  • rustdoc expanded to 9 candidates
  • Random selection from GuillaumeGomez, fmease, lolbinarycat, notriddle

@bjorn3
Copy link
Copy Markdown
Member

bjorn3 commented Apr 17, 2026

ignore another typo in vendored sources.

Should vendored sources not be excluded from the typo check?

@lolbinarycat
Copy link
Copy Markdown
Contributor

Should vendored sources not be excluded from the typo check?

They are, I'm guessing something other than ./x test tidy --extra-checks=spellcheck was used to run the typo check.

Copy link
Copy Markdown
Contributor

@lolbinarycat lolbinarycat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know enough about this target to know if this makes more sense as a label than just "mlibc", but I do know that the change to typos.toml doesn't make much sense.

View changes since this review

Comment thread typos.toml Outdated
@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 17, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 17, 2026

Reminder, once the PR becomes ready for a review, use @rustbot ready.

cdilga added a commit to cdilga/roger-reviewer that referenced this pull request Apr 19, 2026
… rr-6iah.8

Capture the 2026-04-19 live PR-page rehearsal evidence after deterministic extension-id fixes, including trusted Start click execution on rust-lang/rust#155408 and authoritative local-session binding proof via rr sessions/status artifacts.

Update current status to reflect AC closure based on evidence (runbook + credential/cleanup policy + operator-stability artifacts), without widening claims to deterministic E2E coverage or outbound posting.
@teor2345
Copy link
Copy Markdown
Contributor Author

teor2345 commented Apr 19, 2026

Reverted the typo exception in d68d4f3 (this PR)

It's referred to as "mlibc" or the "Managarm C Library", I think something more explicit would help avoid confusion with macOS (which is the confusion that's being fixed in this PR):
https://dl.gi.de/server/api/core/bitstreams/dabcf748-5ee0-4cbe-a2b5-cb2576fa8113/content

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 19, 2026
@teor2345
Copy link
Copy Markdown
Contributor Author

I squashed the reverted change into the typo fix commit

@teor2345 teor2345 force-pushed the rustdoc-env-names branch from d68d4f3 to 759af6d Compare April 21, 2026 04:41
@lolbinarycat
Copy link
Copy Markdown
Contributor

It's referred to as "mlibc" or the "Managarm C Library", I think something more explicit would help avoid confusion with macOS

Yes, I agree with making it more explicit. I just don't know if "Managarm" is the best string for that since it seems that is the name of the OS, and this is the env part of the triple, not the OS part. I think just "mlibc" would be the clearest, but "Managarm C Library" would also be acceptable.

@teor2345 teor2345 force-pushed the rustdoc-env-names branch from 759af6d to 34c0fe8 Compare April 23, 2026 07:10
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 23, 2026

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@teor2345
Copy link
Copy Markdown
Contributor Author

Makes sense, I went with "Managarm C Library" to avoid confusion with "macOS" [C Library].

(Apologies for the rebase, my local dev environment was broken by the aarch64 linker and target bugs, and rebasing seemed like the easiest way to fix it.)

@lolbinarycat lolbinarycat changed the title rustdoc: Fix Managarm name in cfg pretty printer rustdoc: Fix Managarm C Library name in cfg pretty printer Apr 24, 2026
@lolbinarycat
Copy link
Copy Markdown
Contributor

Thanks!

@bors r+ rollup

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 24, 2026

📌 Commit 34c0fe8 has been approved by lolbinarycat

It is now in the queue for this repository.

@rust-bors rust-bors Bot added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 24, 2026
@rust-bors rust-bors Bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 24, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Apr 24, 2026
…inarycat

rustdoc: Fix Managarm C Library name in cfg pretty printer

Like rust-lang#155293, this was introduced in rust-lang#154328.

Unlike that PR, I don't think there's any need to backport, because this cfg is not used anywhere in the standard library.
(I searched for `"mlibc"`, the only place it's used in rust-lang/rust is the HTML doc test.)

#### Other Minor Fixes

Remove a FIXME comment in the pretty printer, `os = "none"` is always bare metal:
https://github.com/rust-lang/rust/blob/d227e48c560e915fe7c0b8b3e821680a3a0ba739/compiler/rustc_target/src/spec/mod.rs#L3179

Fix a comment typo, ignore another typo in vendored sources.
rust-bors Bot pushed a commit that referenced this pull request Apr 24, 2026
…uwer

Rollup of 12 pull requests

Successful merges:

 - #149452 (Refactor out common code into a `IndexItem::new` constructor)
 - #155621 (Document #[diagnostic::on_move] in the unstable book.)
 - #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
 - #155730 (Some cleanups around per parent disambiguators)
 - #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
 - #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
 - #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
 - #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
 - #155713 (test: Add a regression test for Apple platforms aborting on `free`)
 - #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
 - #155735 (Fix typo by removing extra 'to')
 - #155736 (Remove `AllVariants` workaround for rust-analyzer)
rust-bors Bot pushed a commit that referenced this pull request Apr 24, 2026
…uwer

Rollup of 12 pull requests

Successful merges:

 - #149452 (Refactor out common code into a `IndexItem::new` constructor)
 - #155621 (Document #[diagnostic::on_move] in the unstable book.)
 - #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
 - #155730 (Some cleanups around per parent disambiguators)
 - #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
 - #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
 - #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
 - #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
 - #155713 (test: Add a regression test for Apple platforms aborting on `free`)
 - #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
 - #155735 (Fix typo by removing extra 'to')
 - #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors rust-bors Bot merged commit 39d5d45 into rust-lang:main Apr 24, 2026
11 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 24, 2026
rust-timer added a commit that referenced this pull request Apr 24, 2026
Rollup merge of #155408 - teor2345:rustdoc-env-names, r=lolbinarycat

rustdoc: Fix Managarm C Library name in cfg pretty printer

Like #155293, this was introduced in #154328.

Unlike that PR, I don't think there's any need to backport, because this cfg is not used anywhere in the standard library.
(I searched for `"mlibc"`, the only place it's used in rust-lang/rust is the HTML doc test.)

#### Other Minor Fixes

Remove a FIXME comment in the pretty printer, `os = "none"` is always bare metal:
https://github.com/rust-lang/rust/blob/d227e48c560e915fe7c0b8b3e821680a3a0ba739/compiler/rustc_target/src/spec/mod.rs#L3179

Fix a comment typo, ignore another typo in vendored sources.
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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants