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 7 pull requests #131848

Merged
merged 17 commits into from
Oct 17, 2024
Merged

Rollup of 7 pull requests #131848

merged 17 commits into from
Oct 17, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

WaffleLapkin and others added 17 commits September 20, 2024 11:43
Fixes string manipulation errors introduced in rust-lang#130446.
This was seen on Ferrocene, where we have a custom test target that does not have unwind support
Provide a more convinient way of developing rustc on NixOS

This PR adds envrc files which, once symlinked as  `.envrc` will activates a dev shell from `src/tools/nix-dev-shell/flake.nix` or `src/tools/nix-dev-shell/shell.nix`.

This is based on
- [Current rustc dev guide recommendation for NixOS](https://rustc-dev-guide.rust-lang.org/building/suggested.html?highlight=nix#using-nix-shell)
- https://github.com/oxalica/rust-overlay?tab=readme-ov-file#use-in-devshell-for-nix-develop
- [Nora's `x` nix package](https://github.com/Noratrieb/nixos/tree/26ea68e1a0aadaab313c1b5a8c1033a9770bd138/custom-pkgs/x)
- rust-lang/rustup#2891
- [Direnv: use flake/nix according to availability](https://discourse.nixos.org/t/direnv-use-flake-nix-according-to-availability/29825)

This is something that I plan to use personally, but I thought it might be worth upstreaming :)

r? Noratrieb
rustc_llvm: Fix flattened CLI args

Fixes string manipulation errors introduced in rust-lang#130446.
…eyouxu

Enable XRay instrumentation for LoongArch Linux targets

Enable XRay instrumentation for `loongarch64-unknown-linux-{gnu, musl, ohos}` targets.
…ler-errors

SolverDelegate add assoc type for Infcx

makes writing trait bounds on it a lot nicer going forward.

r? `@compiler-errors`
Add `must_use` to `CommandExt::exec`

[CommandExt::exec](https://fburl.com/0qhpo7nu) returns a `std::io::Error` in the case exec fails, but its not currently marked as `must_use` making it easy to accidentally ignore it.

This PR adds the `must_use` attributed here as i think it fits the definition in the guide of [When to add #[must_use]](https://std-dev-guide.rust-lang.org/policy/must-use.html#when-to-add-must_use)
…ribute-unwind, r=Noratrieb

Do not run test where it cannot run

This was seen on Ferrocene, where we have a custom test target that does not have unwind support
Add mailmap entry for kobzol

Hopefully I got this right.
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself O-unix Operating system: Unix-like 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Oct 17, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Oct 17, 2024

📌 Commit c9f3a7d has been approved by matthiaskrgr

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 Oct 17, 2024
@bors
Copy link
Contributor

bors commented Oct 17, 2024

⌛ Testing commit c9f3a7d with merge 3ed6e3c...

@bors
Copy link
Contributor

bors commented Oct 17, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 3ed6e3c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 17, 2024
@bors bors merged commit 3ed6e3c into rust-lang:master Oct 17, 2024
7 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Oct 17, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#129620 Provide a more convinient way of developing rustc on NixOS 9c202ac7c59d2168f7eafdbeef1ab15fd783ac67 (link)
#131805 rustc_llvm: Fix flattened CLI args 00745c14181ab813a389bdd668887723c7ef4792 (link)
#131818 Enable XRay instrumentation for LoongArch Linux targets c174125e3217ec4400382ebeb2e20fbb5428063c (link)
#131825 SolverDelegate add assoc type for Infcx c2f9ec6f177b9cf6f130e7955da98ab1fabac01a (link)
#131833 Add must_use to CommandExt::exec 42878463bce562e412753d04d4c82af45f545de9 (link)
#131835 Do not run test where it cannot run dbc933e2c09a42ebac5838eacf5a36bfe05e1373 (link)
#131844 Add mailmap entry for kobzol e1515b66a09ef4dde19cf617244052f7cd0443d3 (link)

previous master: 86bd45979a

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (3ed6e3c): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

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

Cycles

Results (secondary -2.1%)

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)
- - 0
Improvements ✅
(secondary)
-2.1% [-2.1%, -2.1%] 1
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 782.744s -> 782.2s (-0.07%)
Artifact size: 333.77 MiB -> 333.85 MiB (0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself merged-by-bors This PR was explicitly merged by bors. O-unix Operating system: Unix-like rollup A PR which is a rollup 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-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.