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 5 pull requests #131869

Merged
merged 18 commits into from
Oct 18, 2024
Merged

Rollup of 5 pull requests #131869

merged 18 commits into from
Oct 18, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

xobs and others added 18 commits October 13, 2024 21:27
The recent changes to naked `asm!()` macros made this unbuildable
on Xous. The upstream package maintainer released 0.2.3 to fix support
on newer nightly toolchains.

Update the dependency to 0.2.3, which is the oldest version that works
with the current nightly compiler.

This closes rust-lang#131602 and fixes the build on xous.

Signed-off-by: Sean Cross <[email protected]>
Process arguments and environment variables are both passed by way of
Application Parameters. These are a TLV format that gets passed in as
the second process argument.

This patch combines both as they are very similar in their decode.

Signed-off-by: Sean Cross <[email protected]>
Signed-off-by: Sean Cross <[email protected]>
The AdjustProcessLimit syscall was using the correct call number.

Signed-off-by: Sean Cross <[email protected]>
The allocator on Xous is now throwing warnings because the allocator
needs to be mutable, and allocators hand out mutable pointers, which
the `static_mut_refs` lint now catches.

Give the same treatment to Xous as wasm, at least until a solution is
devised for fixing the warning on wasm.

Signed-off-by: Sean Cross <[email protected]>
This was added in cc3c8bb when it was
closer to the `extract_one` call. Move it back near that call.
the line was missing closing parenthesis
…=thomcc

Various fixes for Xous

This patchset includes several fixes for Xous that have crept in over the last few months:

* The `adjust_process()` syscall was incorrect
* Warnings have started appearing in `alloc` -- adopt the same approach as wasm, until wasm figures out a workaround
* Dead code warnings have appeared in the networking code. Add `allow(dead_code)` as these structs are used as IPC values
* Add support for `args` and `env`, which have been useful for running tests
* Update `unwinding` to `0.2.3` which fixes the recent regression due to changes in `asm!()` code
…dy, r=lcnr

rustc_metadata: minor tidying

Cleaned up some code while investigating rust-lang#131720.

See individual commits.
…kingjubilee

Bump libc to 0.2.161

Bumps libc to the latest release version 0.2.161 which
- includes libc support for the tier 3 RTEMS target
- fixes segfaults on 32-bit FreeBSD targets
- gets musl's `posix_spawn_file_actions_addchdir_np` for some spawn opts
Missing parenthesis

the line was missing closing parenthesis
… r=compiler-errors

Allow dropping dyn principal

Revival of rust-lang#126660, which was a revival of rust-lang#114679. Fixes rust-lang#126313.

Allows dropping principal when coercing trait objects, e.g. `dyn Debug + Send` -> `dyn Send`.

cc `@compiler-errors` `@Jules-Bertholet`
r? `@lcnr`
@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. 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 18, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Oct 18, 2024

📌 Commit 13b3984 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 18, 2024
@jhpratt
Copy link
Member

jhpratt commented Oct 18, 2024

See #131867 — my suspicion is the rustc_metadata change is why it failed but I'm not positive.

@bors
Copy link
Contributor

bors commented Oct 18, 2024

⌛ Testing commit 13b3984 with merge db8043b...

@jieyouxu
Copy link
Member

jieyouxu commented Oct 18, 2024

See #131867 — my suspicion is the rustc_metadata change is why it failed but I'm not positive.

@jhpratt that's one of the msvc spurious failures, i.e. #127883. I started to tag the PRs that fail like #127883 with CI-spurious-fail-msvc CI spurious failure: target env msvc

@bors
Copy link
Contributor

bors commented Oct 18, 2024

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

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#131654 Various fixes for Xous 063f44fa4f7355b5bcf8731b2a5b5736a8d01695 (link)
#131743 rustc_metadata: minor tidying 9207519c2f38c33b28774d7518141d39b7edb7d1 (link)
#131823 Bump libc to 0.2.161 fd2053041260a98dde80baba0d8d83a9b08f2b48 (link)
#131850 Missing parenthesis 469779c91d9df5a514f715b79b8f9ef0e815606a (link)
#131857 Allow dropping dyn principal ac03830635242ccb6bc5f5ba2cf970e1ceb5575b (link)

previous master: d9c4b8d475

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

@jhpratt
Copy link
Member

jhpratt commented Oct 18, 2024

Thanks for the info. I'll be sure to simply retry it in the future (in addition to tagging).

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (db8043b): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.4% [0.3%, 0.6%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 3.2%, 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)
3.2% [2.9%, 3.5%] 3
Regressions ❌
(secondary)
2.1% [2.1%, 2.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 3.2% [2.9%, 3.5%] 3

Cycles

Results (secondary -7.9%)

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)
-7.9% [-9.2%, -6.5%] 2
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 779.34s -> 781.028s (0.22%)
Artifact size: 333.82 MiB -> 333.79 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.