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

Rollup of 8 pull requests #132069

Closed
wants to merge 24 commits into from
Closed

Rollup of 8 pull requests #132069

wants to merge 24 commits into from

Commits on Oct 19, 2024

  1. 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).
    aDotInTheVoid committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    3b78956 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2024

  1. Configuration menu
    Copy the full SHA
    0e60076 View commit details
    Browse the repository at this point in the history
  2. tweak hybrid preds

    compiler-errors committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    73a37a1 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. apply suggestions

    dingxiangfei2009 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    d51b702 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. add an option for a custom differ

    Orion Gonzalez committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    7323830 View commit details
    Browse the repository at this point in the history
  2. implemented custom differ

    Orion Gonzalez committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    ef4325e View commit details
    Browse the repository at this point in the history
  3. update CONFIG_CHANGE_HISTORY

    Orion Gonzalez committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    37ffb94 View commit details
    Browse the repository at this point in the history
  4. s/display-diff-tool/compiletest-diff-tool/

    Orion Gonzalez committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    c8de61b View commit details
    Browse the repository at this point in the history
  5. real default value

    Orion Gonzalez committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    28095bc View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. do not remove .cargo directroy

    Signed-off-by: onur-ozkan <[email protected]>
    onur-ozkan committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    47d6667 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1b59216 View commit details
    Browse the repository at this point in the history
  3. 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
    adetaylor committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    2eb7e0d View commit details
    Browse the repository at this point in the history
  4. "innermost", "outermost", "leftmost", and "rightmost" don't need hyphens

    These are all standard dictionary words and don't require hyphenation.
    joshtriplett committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    ecdc244 View commit details
    Browse the repository at this point in the history
  5. update wording

    dingxiangfei2009 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    8002cde View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    21d95fb View commit details
    Browse the repository at this point in the history
  7. apply suggestions

    dingxiangfei2009 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    43803df View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#131043 - liwagu:unify, r=albertlarsan68,onu…

    …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`
    fmease authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    496a320 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#131181 - dev-ardi:custom-differ, r=jieyouxu

    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)
    fmease authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    575a84c View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#131928 - aDotInTheVoid:wait-we-support-this…

    …, 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).
    fmease authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    b5190d0 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#131979 - compiler-errors:compare-pred-entai…

    …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`.
    fmease authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    d109024 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#131983 - dingxiangfei2009:stabilize-shorter…

    …-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.
    fmease authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    1eb3e54 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#132054 - onur-ozkan:cargo-config, r=Kobzol

    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.
    fmease authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    8d05674 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#132058 - adetaylor:use-rust-next-in-ci, r=lqd

    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
    fmease authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    8053a1b View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#132060 - joshtriplett:innermost-outermost, …

    …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 authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    c8d5c65 View commit details
    Browse the repository at this point in the history