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 6 pull requests #127067

Closed
wants to merge 25 commits into from

Commits on Jun 19, 2024

  1. ignore llvm::Lld step if lld is not enabled

    People are having trouble when they don't want to build `lld` for their custom
    distribution tarballs even with `lld = false` in their config.toml. This is because
    it is not controlled by `lld_enabled` flag. This change ensures that `llvm:Lld`
    is controlled by lld configuration.
    
    Signed-off-by: onur-ozkan <work@onurozkan.dev>
    onur-ozkan committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    f22775b View commit details
    Browse the repository at this point in the history
  2. add lld = true to default dist profile

    Make sure lld is enabled for dist profile unless it is explicitly disabled.
    
    Signed-off-by: onur-ozkan <work@onurozkan.dev>
    onur-ozkan committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    c890a81 View commit details
    Browse the repository at this point in the history
  3. disable lld if external llvm is used

    Signed-off-by: onur-ozkan <work@onurozkan.dev>
    onur-ozkan committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    bfca652 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. bootstrap: exclude cargo from package metadata

    Signed-off-by: onur-ozkan <work@onurozkan.dev>
    onur-ozkan committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    11acf83 View commit details
    Browse the repository at this point in the history
  2. don't fetch/sync cargo submodule by default

    Signed-off-by: onur-ozkan <work@onurozkan.dev>
    onur-ozkan committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    457ac5d View commit details
    Browse the repository at this point in the history
  3. refactor tool_doc macro in bootstrap

    Signed-off-by: onur-ozkan <work@onurozkan.dev>
    onur-ozkan committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    8c3ebf7 View commit details
    Browse the repository at this point in the history
  4. handle cargo submodule in a lazy-load way

    Signed-off-by: onur-ozkan <work@onurozkan.dev>
    onur-ozkan committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    51f6e68 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Support for -Z patchable-function-entry

    `-Z patchable-function-entry` works like `-fpatchable-function-entry`
    on clang/gcc. The arguments are total nop count and function offset.
    
    See MCP rust-lang/compiler-team#704
    maurer authored and nebulark committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    ac7595f View commit details
    Browse the repository at this point in the history
  2. Support #[patchable_function_entries]

    See [RFC](https://github.com/maurer/rust-rfcs/blob/patchable-function-entry/text/0000-patchable-function-entry.md) (yet to be numbered)
    
    TODO before submission:
    * Needs an RFC
    * Improve error reporting for malformed attributes
    maurer authored and nebulark committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    9b0ae75 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7c56398 View commit details
    Browse the repository at this point in the history
  4. Simplify str::clone_into

    Removes an `unsafe` in favor of just using `String` methods.
    DaniPopes committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    d5ff4f4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2c9556d View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    23d1cc4 View commit details
    Browse the repository at this point in the history
  7. update coverage test

    joboet committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    7526416 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. core: improve comment

    Co-authored-by: Ralf Jung <post@ralfj.de>
    joboet and RalfJung authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    7e7d0a9 View commit details
    Browse the repository at this point in the history
  2. remove unnecessary packages from metadata::workspace_members

    Currently bootstrap doesn't use any inner paths from rust-analyzer and
    bootstrap with `ShouldRun::create_or_deps`.
    
    Signed-off-by: onur-ozkan <work@onurozkan.dev>
    onur-ozkan committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    3457ecc View commit details
    Browse the repository at this point in the history
  3. add change-tracker entry

    Signed-off-by: onur-ozkan <work@onurozkan.dev>
    onur-ozkan committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    b1b473e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    789ee88 View commit details
    Browse the repository at this point in the history
  5. Updated diagnostic messages

    nebulark committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    8d246b0 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Rollup merge of rust-lang#124741 - nebulark:patchable-function-entrie…

    …s-pr, r=estebank,workingjubilee
    
    patchable-function-entry: Add unstable compiler flag and attribute
    
    Tracking issue: rust-lang#123115
    
    Add the -Z patchable-function-entry compiler flag and the #[patchable_function_entry(prefix_nops = m, entry_nops = n)] attribute.
    Rebased and adjusted the canditate implementation to match changes in the RFC.
    matthiaskrgr authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    75834c9 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#126470 - onur-ozkan:optional-cargo-submodul…

    …e, r=Kobzol
    
    make cargo submodule optional
    
    Right now, we fetch the cargo submodule no matter what, even if the command we are running doesn't need it (e.g., `x build compiler library`). This PR changes that to only fetch the cargo submodule when it's necessary.
    
    For more context, see the zulip thread: https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/Why.20is.20cargo.20always.20checked.20out.3F
    matthiaskrgr authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    6909cde View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#126701 - onur-ozkan:build-lld-if-enabled, r…

    …=Kobzol
    
    ignore `llvm::Lld` if lld is not enabled
    
    People are having trouble ([ref. zulip thread](https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/MSVC.20Runtime.20mismatch.20when.20building.20LLD)) when they don't want to build `lld` for their custom distribution tarballs even with `lld = false` in their config.toml. This is because it is not controlled by `lld_enabled` flag. This change ensures that `llvm:Lld` is controlled by lld configuration.
    
    Additionally, `lld = true` is set by default for dist profile, because we have been building it all along and this maintains that behavior.
    matthiaskrgr authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    71f9d3a View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#126956 - joboet:fmt_no_extern_ty, r=RalfJung

    core: avoid `extern type`s in formatting infrastructure
    
    ``@RalfJung`` [said](https://rust-lang.zulipchat.com/#narrow/stream/219381-t-libs/topic/Use.20of.20.60extern.20type.60.20in.20formatting.20machinery/near/446552837):
    
    >How attached are y'all to using `extern type` in the formatting machinery?
    Seems like this was introduced a [long time ago](rust-lang@34ef8f5). However, it's also [not really compatible with Stacked Borrows](rust-lang/unsafe-code-guidelines#256), and only works currently because we effectively treat references-to-extern-type almost like raw pointers in Stacked Borrows -- which of course is unsound, it's not how LLVM works. I was planning to make Miri emit a warning when this happens to avoid cases like [this](rust-lang#126814 (comment)) where people use extern type specifically to silence Miri without realizing what happens. but with the formatting machinery using  extern type, this warning would just show up everywhere...
    >
    > The "proper" way to do this in Stacked Borrows is to use raw pointers (or `NonNull`).
    
    This PR does just that.
    
    r? ``@RalfJung``
    matthiaskrgr authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    e94100b View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#126970 - DaniPopes:simplify-str-clone_into,…

    … r=cuviper
    
    Simplify `str::clone_into`
    
    Removes an `unsafe` in favor of just using `String` methods.
    matthiaskrgr authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    a66f2c2 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#127058 - compiler-errors:tighten-async-span…

    …s, r=oli-obk
    
    Tighten `fn_decl_span` for async blocks
    
    Tightens the span of `async {}` blocks in diagnostics, and subsequently async closures and async fns, by actually setting the `fn_decl_span` correctly. This is kinda a follow-up on rust-lang#125078, but it fixes the problem in a more general way.
    
    I think the diagnostics are significantly improved, since we no longer have a bunch of overlapping spans. I'll point out one caveat where I think the diagnostic may get a bit more confusing, but where I don't think it matters.
    
    r? ```@estebank``` or ```@oli-obk``` or someone else on wg-diag or compiler i dont really care lol
    matthiaskrgr authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    f305466 View commit details
    Browse the repository at this point in the history