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

rustc_resolve: fix instability in lib.rmeta contents #138678

Merged
merged 3 commits into from
Mar 28, 2025

Conversation

durin42
Copy link
Contributor

@durin42 durin42 commented Mar 18, 2025

23032f31c91f2 accidentally introduced some nondeterminism in the ordering of lib.rmeta files, which we caught in our bazel-based builds only recently due to being further behind than normal. In my testing, this fixes the issue.

@rustbot
Copy link
Collaborator

rustbot commented Mar 18, 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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 18, 2025
@rust-log-analyzer

This comment has been minimized.

rust-lang/rust@23032f31c91f2 accidentally introduced some nondeterminism
in the ordering of lib.rmeta files, which we caught in our bazel-based
builds only recently due to being further behind than normal. In my
testing, this fixes the issue.
@rustbot
Copy link
Collaborator

rustbot commented Mar 18, 2025

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@fmease
Copy link
Member

fmease commented Mar 27, 2025

Sorry for the delay, thanks!

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 27, 2025

📌 Commit 795a666 has been approved by fmease

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 27, 2025
@fmease
Copy link
Member

fmease commented Mar 27, 2025

Wait, could you also update the callsite of reference_definitions in src/librustdoc/html/markdown.rs?

@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 27, 2025
@rustbot rustbot added the T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. label Mar 27, 2025
@durin42
Copy link
Contributor Author

durin42 commented Mar 27, 2025

Wait, could you also update the callsite of reference_definitions in src/librustdoc/html/markdown.rs?

@bors r-

Done

This came up in review, and it should help some future author
not introduce non-deterministic output here.
@fmease
Copy link
Member

fmease commented Mar 28, 2025

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 28, 2025

📌 Commit 1437dec has been approved by fmease

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 28, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 28, 2025
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#137889 (update outdated doc with new example)
 - rust-lang#138104 (Greatly simplify doctest parsing and information extraction)
 - rust-lang#138678 (rustc_resolve: fix instability in lib.rmeta contents)
 - rust-lang#138986 (feat(config): Add ChangeId enum for suppressing warnings)
 - rust-lang#139038 (Update target maintainers for thumb targets to reflect new REWG Arm team name)
 - rust-lang#139045 (bootstrap: update `test_find` test)
 - rust-lang#139047 (Remove ScopeDepth)

Failed merges:

 - rust-lang#139044 (bootstrap: Avoid cloning `change-id` list)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 28, 2025
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#137889 (update outdated doc with new example)
 - rust-lang#138104 (Greatly simplify doctest parsing and information extraction)
 - rust-lang#138678 (rustc_resolve: fix instability in lib.rmeta contents)
 - rust-lang#138986 (feat(config): Add ChangeId enum for suppressing warnings)
 - rust-lang#139038 (Update target maintainers for thumb targets to reflect new REWG Arm team name)
 - rust-lang#139045 (bootstrap: update `test_find` test)
 - rust-lang#139047 (Remove ScopeDepth)

Failed merges:

 - rust-lang#139044 (bootstrap: Avoid cloning `change-id` list)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit bdc5adf into rust-lang:master Mar 28, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 28, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 28, 2025
Rollup merge of rust-lang#138678 - durin42:rmeta-stability, r=fmease

rustc_resolve: fix instability in lib.rmeta contents

rust-lang/rust@23032f31c91f2 accidentally introduced some nondeterminism in the ordering of lib.rmeta files, which we caught in our bazel-based builds only recently due to being further behind than normal. In my testing, this fixes the issue.
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-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.

6 participants