Rollup of 8 pull requests by fmease · Pull Request #132069 · rust-lang/rust

fmease · 2024-10-23T14:52:42Z

Successful merges:

Refactor change detection for rustdoc and download-rustc #131043 (Refactor change detection for rustdoc and download-rustc)
Compiletest: Custom differ #131181 (Compiletest: Custom differ)
rustdoc: Document markdown module. #131928 (rustdoc: Document markdown module.)
Minor tweaks to compare_impl_item.rs #131979 (Minor tweaks to compare_impl_item.rs)
Stabilize shorter-tail-lifetimes #131983 (Stabilize shorter-tail-lifetimes)
do not remove .cargo directory #132054 (do not remove .cargo directory)
CI: rfl: use rust-next temporary commit #132058 (CI: rfl: use rust-next temporary commit)
"innermost", "outermost", "leftmost", and "rightmost" don't need hyphens #132060 ("innermost", "outermost", "leftmost", and "rightmost" don't need hyphens)

r? @ghost
@rustbot modify labels: rollup

Rustdoc markdown handling is currently split between: - html::markdown, which contains all the meaty login - markdown, which is only used for when rustdoc renders a standalone markdown file Adds module-level doc-comment to markdown, and rename the function so it's clear that it's doing IO (instead of just rendering to a string).

Signed-off-by: onur-ozkan <work@onurozkan.dev>

Commit c95bbb59a9b22f9b838b15d28319185c1c884329 within rust-next contains some changes required to be compatible with upcoming arbitraty self types work. Roll RFL CI forward to the latest rust-next to include that work. Related: rust-lang#130225 rust-lang#44874

These are all standard dictionary words and don't require hyphenation.

…r-ozkan Refactor change detection for rustdoc and download-rustc This pull request refactors the change detection logic in the build process by consolidating redundant code into a new helper method. The key changes include the removal of duplicate logic for checking changes in directories and the addition of a new method to handle this functionality. Refactoring and code simplification: * [`src/bootstrap/src/core/build_steps/tool.rs`](diffhunk://#diff-dc86e288bcf7b3ca3f8c127d3568fbafc785704883bc7fc336bd185910aed5daL588-R593): Removed redundant change detection logic and replaced it with a call to the new `check_for_changes` method. * [`src/bootstrap/src/core/config/config.rs`](diffhunk://#diff-5f5330cfcdb0a89b85ac3547b761c3a45c2534a85c4aaae8fea88c711a7a65b2R2837-R2872): Added a new method `check_for_changes` to centralize the logic for detecting changes in specified directories since a given commit. * [`src/bootstrap/src/core/config/config.rs`](diffhunk://#diff-5f5330cfcdb0a89b85ac3547b761c3a45c2534a85c4aaae8fea88c711a7a65b2L2728-R2740): Updated the existing change detection code to use the new `check_for_changes` method. Cleanup: * [`src/bootstrap/src/core/build_steps/tool.rs`](diffhunk://#diff-dc86e288bcf7b3ca3f8c127d3568fbafc785704883bc7fc336bd185910aed5daL13-R13): Removed the unused import `git` from the helpers module. r? `@AlbertLarsan68`

Compiletest: Custom differ This adds support for a custom differ for compiletests. It’s purely visual and helps produce cleaner output when UI tests fail. I’m using an environment variable for now since it’s experimental and I don’t want to drill the cli arguments all the way down. Also did a bit of general cleanup while I was at it. This is how it looks [with debug info silenced](rust-lang#131182) (rust-lang#131182) `COMPILETEST_DIFF_TOOL="/usr/bin/env difft --color always --background light --display side-by-side" ./x test tests/ui/parser` ![image](https://github.com/user-attachments/assets/f740ce50-7564-4469-be0a-86e24bc50eb8)

…, r=GuillaumeGomez rustdoc: Document `markdown` module. Rustdoc markdown handling is currently split between: - html::markdown, which contains all the meaty login - markdown, which is only used for when rustdoc renders a standalone markdown file Adds module-level doc-comment to markdown, and rename the function so it's clear that it's doing IO (instead of just rendering to a string).

…l, r=fmease Minor tweaks to `compare_impl_item.rs` 1. Stop using the `InstantiatedPredicates` struct for `hybrid_preds` in `compare_impl_item.rs`, since we never actually push anything into the `spans` part of it. 2. Remove redundant impl args and don't do useless identity substitution, prefer calling `instantiate_identity`.

…-tail-lifetimes, r=lcnr Stabilize shorter-tail-lifetimes Close rust-lang#131445 Tracked by rust-lang#123739 We found a test case `tests/ui/drop/drop_order.rs` that had not been covered by the change. The test fixture is fixed now with the correct expectation.

do not remove `.cargo` directory If vendoring isn't used bootstrap removes `.cargo` directory, which prevents developers from setting certain options in the `.cargo/config.toml` file. This was introduced in rust-lang#97513 (specifically in [this commit](rust-lang@345eb14)). Also, since rust-lang#123942, vendoring is now possible even in git sources, which means we shouldn't remove `.cargo` directory in git sources anymore.

CI: rfl: use rust-next temporary commit Commit c95bbb59a9b22f9b838b15d28319185c1c884329 within rust-next contains some changes required to be compatible with upcoming arbitraty self types work. Roll RFL CI forward to the latest rust-next to include that work. Related: rust-lang#130225 rust-lang#44874 r? `@ojeda` try-job: x86_64-rust-for-linux

…r=jieyouxu "innermost", "outermost", "leftmost", and "rightmost" don't need hyphens These are all standard dictionary words and don't require hyphenation. ----- Encountered an instance of this in error messages and it bugged me, so I figured I'd fix it across the entire codebase.

fmease · 2024-10-23T14:53:19Z

@bors r+ rollup=never p=5

bors · 2024-10-23T14:53:22Z

📌 Commit c8d5c65 has been approved by fmease

It is now in the queue for this repository.

bors · 2024-10-23T15:20:12Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-jmfu3cu (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-jmfu3cu --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging compiler/rustc_lint/src/tail_expr_drop_order.rs
CONFLICT (content): Merge conflict in compiler/rustc_lint/src/tail_expr_drop_order.rs
Auto-merging compiler/rustc_hir_typeck/src/upvar.rs
Auto-merging compiler/rustc_hir_analysis/src/check/region.rs
CONFLICT (content): Merge conflict in compiler/rustc_hir_analysis/src/check/region.rs
Auto-merging compiler/rustc_feature/src/unstable.rs
Auto-merging compiler/rustc_feature/src/accepted.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2024-10-23T16:13:27Z

☔ The latest upstream changes (presumably #132027) made this pull request unmergeable. Please resolve the merge conflicts.

fmease · 2024-10-23T16:16:16Z

@bors r-

aDotInTheVoid and others added 24 commits October 19, 2024 13:37

stabilize shorter-tail-lifetimes

0e60076

tweak hybrid preds

73a37a1

apply suggestions

d51b702

add an option for a custom differ

7323830

implemented custom differ

ef4325e

update CONFIG_CHANGE_HISTORY

37ffb94

s/display-diff-tool/compiletest-diff-tool/

c8de61b

real default value

28095bc

do not remove .cargo directroy

47d6667

Signed-off-by: onur-ozkan <work@onurozkan.dev>

Refactor change detection for rustdoc and download-rustc

1b59216

"innermost", "outermost", "leftmost", and "rightmost" don't need hyphens

ecdc244

These are all standard dictionary words and don't require hyphenation.

update wording

8002cde

More compare_impl_item simplifications

21d95fb

apply suggestions

43803df

rustbot added T-libs Relevant to the library 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. rollup A PR which is a rollup labels Oct 23, 2024

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 Oct 23, 2024

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 Oct 23, 2024

fmease closed this Oct 23, 2024

fmease deleted the rollup-jmfu3cu branch October 23, 2024 15:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 8 pull requests#132069

Rollup of 8 pull requests#132069
fmease wants to merge 24 commits intorust-lang:masterfrom
fmease:rollup-jmfu3cu

fmease commented Oct 23, 2024

Uh oh!

fmease commented Oct 23, 2024

Uh oh!

bors commented Oct 23, 2024

Uh oh!

bors commented Oct 23, 2024

Uh oh!

bors commented Oct 23, 2024

Uh oh!

fmease commented Oct 23, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Conversation

fmease commented Oct 23, 2024

Uh oh!

fmease commented Oct 23, 2024

Uh oh!

bors commented Oct 23, 2024

Uh oh!

bors commented Oct 23, 2024

Uh oh!

bors commented Oct 23, 2024

Uh oh!

fmease commented Oct 23, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants