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

rustdoc: use import stability marker in display #135352

Merged
merged 1 commit into from
Jan 13, 2025

Conversation

notriddle
Copy link
Contributor

Fixes #135078

@rustbot
Copy link
Collaborator

rustbot commented Jan 11, 2025

r? @fmease

rustbot has assigned @fmease.
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

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jan 11, 2025
@rust-log-analyzer

This comment has been minimized.

@notriddle notriddle force-pushed the notriddle/stability-shown branch 3 times, most recently from 1c83f04 to ce215c0 Compare January 11, 2025 02:45
Copy link
Member

@camelid camelid left a comment

Choose a reason for hiding this comment

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

Thanks! r=me after addressing the comment on the test

tests/rustdoc/inline_local/staged-inline.rs Outdated Show resolved Hide resolved
@camelid camelid assigned camelid and unassigned fmease Jan 11, 2025
@camelid camelid 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 Jan 11, 2025
@rust-log-analyzer

This comment has been minimized.

@notriddle notriddle force-pushed the notriddle/stability-shown branch from ce215c0 to 74aca3f Compare January 11, 2025 16:22
@rust-log-analyzer

This comment has been minimized.

@notriddle notriddle force-pushed the notriddle/stability-shown branch from 74aca3f to 916cfbc Compare January 11, 2025 22:05
Copy link
Member

@camelid camelid left a comment

Choose a reason for hiding this comment

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

LGTM, thanks. I do wonder whether there are cases opposite from what this fixes -- i.e. where the re-export stability is wrong and the original item is what we should use. I tested locally and found that #[unstable] on a re-export of a stable item is ignored by rustc.

But in the particular case this PR addresses, I think the new behavior overall makes more sense, so let's merge it.

@camelid
Copy link
Member

camelid commented Jan 13, 2025

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 13, 2025

📌 Commit 916cfbc has been approved by camelid

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 Jan 13, 2025
@bors
Copy link
Contributor

bors commented Jan 13, 2025

⌛ Testing commit 916cfbc with merge a2016aa...

@bors
Copy link
Contributor

bors commented Jan 13, 2025

☀️ Test successful - checks-actions
Approved by: camelid
Pushing a2016aa to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 13, 2025
@bors bors merged commit a2016aa into rust-lang:master Jan 13, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 13, 2025
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a2016aa): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.4% [0.4%, 0.4%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -3.0%, secondary -1.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.0% [-3.0%, -3.0%] 1
Improvements ✅
(secondary)
-1.0% [-1.0%, -1.0%] 1
All ❌✅ (primary) -3.0% [-3.0%, -3.0%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 763.719s -> 764.824s (0.14%)
Artifact size: 326.09 MiB -> 326.07 MiB (-0.01%)

@notriddle notriddle deleted the notriddle/stability-shown branch January 13, 2025 18:46
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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rustdoc: "stable since" version is incorrect for std::ffi::CStr
7 participants