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 #126563

Merged
merged 22 commits into from
Jun 16, 2024
Merged

Rollup of 8 pull requests #126563

merged 22 commits into from
Jun 16, 2024

Conversation

jieyouxu
Copy link
Contributor

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Dirbaio and others added 22 commits June 13, 2024 02:44
     Locking 18 packages to latest compatible versions
    Updating annotate-snippets v0.11.3 -> v0.11.4
    Updating clap v4.5.6 -> v4.5.7
    Updating clap_builder v4.5.6 -> v4.5.7
    Updating derive_more v0.99.17 -> v0.99.18
      Adding icu_collections v1.5.0
      Adding icu_normalizer v1.5.0
      Adding icu_normalizer_data v1.5.0
      Adding icu_properties v1.5.0
      Adding icu_properties_data v1.5.0
    Updating idna v0.5.0 -> v1.0.0
    Updating mdbook-i18n-helpers v0.3.3 -> v0.3.4
    Updating redox_syscall v0.5.1 -> v0.5.2
    Updating regex-lite v0.1.5 -> v0.1.6
    Updating regex-syntax v0.8.3 -> v0.8.4
    Removing unicode-bidi v0.3.15
    Updating url v2.5.0 -> v2.5.1
      Adding utf16_iter v1.0.5
      Adding utf8_iter v1.0.4
      Adding write16 v1.0.0
note: pass `--verbose` to see 88 unchanged dependencies behind latest
* Allow crt-static for dylibs
* Pass -lgcc to the linker
Co-Authored-By: Jeremy Soller <jackpot51@gmail.com>
…ulacrum

Weekly `cargo update`

Automation to keep dependencies in `Cargo.lock` current.

The following is the output from `cargo update`:

```txt
     Locking 18 packages to latest compatible versions
    Updating annotate-snippets v0.11.3 -> v0.11.4
    Updating clap v4.5.6 -> v4.5.7
    Updating clap_builder v4.5.6 -> v4.5.7
    Updating derive_more v0.99.17 -> v0.99.18
      Adding icu_collections v1.5.0
      Adding icu_normalizer v1.5.0
      Adding icu_normalizer_data v1.5.0
      Adding icu_properties v1.5.0
      Adding icu_properties_data v1.5.0
    Updating idna v0.5.0 -> v1.0.0
    Updating mdbook-i18n-helpers v0.3.3 -> v0.3.4
    Updating redox_syscall v0.5.1 -> v0.5.2
    Updating regex-lite v0.1.5 -> v0.1.6
    Updating regex-syntax v0.8.3 -> v0.8.4
    Removing unicode-bidi v0.3.15
    Updating url v2.5.0 -> v2.5.1
      Adding utf16_iter v1.0.5
      Adding utf8_iter v1.0.4
      Adding write16 v1.0.0
note: pass `--verbose` to see 88 unchanged dependencies behind latest
```
Various Redox OS fixes and add i686 Redox OS target

All of these come from the fork used by Redox OS available at https://gitlab.redox-os.org/redox-os/rust/-/commits/redox-2024-05-11/?ref_type=heads.

cc `@jackpot51`
…, r=workingjubilee

Honor collapse_debuginfo for statics.

fixes rust-lang#126363

<!--
If this PR is related to an unstable feature or an otherwise tracked effort,
please link to the relevant tracking issue here. If you don't know of a related
tracking issue or there are none, feel free to ignore this.

This PR will get automatically assigned to a reviewer. In case you would like
a specific user to review your work, you can assign it to them by using

    r​? <reviewer name>
-->
bump few deps

This bump deps to cut dupes:

Updating html5ever 0.27
Updating derive_more 0.99.18
Updating crossbeam-deque v0.8.5
Updating crossbeam-epoch v0.9.18
Updating crossbeam-utils v0.8.20
Updating junction v1.1.0

No interesting changes in changelogs.
… r=jieyouxu

Remove unused `llvm_readobj.rs` in `run-make-support`

`llvm_readobj.rs` seems unused from the migration to `llvm.rs` in rust-lang#125165.
Also, `llvm.rs` was missing the drop bombs (rust-lang#125752) in `llvm_readobj.rs`.

Part of rust-lang#121876.

r? `@jieyouxu`
…ngjubilee

std: move `sys_common::backtrace` to `sys`

Part of rust-lang#117276.
… r=jieyouxu

`boxed_slice_into_iter`: tiny doc correction

`CURRENT_RUSTC_VERSION` isn't flexible enough for this, so it got replaced by 1.80.0 instead of 1.79.0 in rust-lang#126273 :/
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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. rollup A PR which is a rollup labels Jun 16, 2024
@jieyouxu
Copy link
Contributor Author

This rollup is very iffy and likely fails, but that's okay.

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jun 16, 2024

📌 Commit 975c702 has been approved by jieyouxu

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 Jun 16, 2024
@workingjubilee
Copy link
Contributor

hatsune miku says YEAH!

@bors
Copy link
Contributor

bors commented Jun 16, 2024

⌛ Testing commit 975c702 with merge d7f6eba...

@bors
Copy link
Contributor

bors commented Jun 16, 2024

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing d7f6eba to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 16, 2024
@bors bors merged commit d7f6eba into rust-lang:master Jun 16, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 16, 2024
@jieyouxu jieyouxu deleted the rollup-7dbtmzk branch June 16, 2024 23:31
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#126178 Weekly cargo update 2bf1d5650830faf1423e5f21e4e98bdeeb145b3f (link)
#126192 Various Redox OS fixes and add i686 Redox OS target ea7233619ced9946638b42a1a3a8517091fbb008 (link)
#126365 Honor collapse_debuginfo for statics. d483533c73dd75f71ae3fb921ea6478b3e3e4e61 (link)
#126524 bump few deps b90c1435bd7de836f7efc7cd6450aaf61db8b951 (link)
#126536 Remove unused llvm_readobj.rs in run-make-support cb1acbdf91a7ec9df9b1757fe329f6bb44716e3a (link)
#126546 std: move sys_common::backtrace to sys 4faf611fbcddeed3d3c9b64b1a64b6a3ad095dff (link)
#126560 more ice tests 55afab0cd5ba60c3f3b19048d7a7d819f65bca6e (link)
#126561 boxed_slice_into_iter: tiny doc correction e30ed1639bf0d5eb41262a294a96bd02c0f745d7 (link)

previous master: 55cac26a9e

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 (d7f6eba): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
1.5% [1.5%, 1.5%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

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

Cycles

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

Binary size

Results (secondary -0.0%)

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)
-0.0% [-0.0%, -0.0%] 23
All ❌✅ (primary) - - 0

Bootstrap: 671.558s -> 671.362s (-0.03%)
Artifact size: 319.87 MiB -> 320.50 MiB (0.20%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet