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.

Sign up for GitHub

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

Jump to bottom

Rollup of 6 pull requests #126461

Closed
wants to merge 16 commits into from
Closed

Rollup of 6 pull requests #126461

wants to merge 16 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Urgau and others added 16 commits May 29, 2024 17:03
@Urgau
non_local_defs: indicate that the macro needs to change
c4c8bda 
aaa
@Urgau
non_local_defs: move cargo update suggestion upper
b5d4867
@dingxiangfei2009
tail expression behind terminating scope
5b86c0d
@jackpot51 @bjorn3
Several fixes to the redox target specs
de12eb9 
* Allow crt-static for dylibs
* Pass -lgcc to the linker
@bjorn3 @jackpot51
Add i686-unknown-redox target
f6669e8 
Co-Authored-By: Jeremy Soller <jackpot51@gmail.com>
@jackpot51 @bjorn3
Use Linux file locking on Redox
db45105
@bjorn3
Add dedicated platform support page for Redox OS
f636d3f
@kpreid
UniqueRc: support allocators and T: ?Sized.
27ecb71 
Added the following (all unstable):

* Defaulted type pararameter `A: Allocator`.
* `UniqueRc::new_in()`.
* `T:  ?Sized` where possible.
* `impl CoerceUnsized for UniqueRc`.
* Drive-by doc polish: links and periods at the end of sentences.

These changes are motivated by supporting the implementation of unsized
`Rc::make_mut()` (PR rust-lang#116113), but are also intended to be obvious
generalizations of `UniqueRc` to support the things `Rc` does.
@cuviper
ci: Update centos:7 to use vault repos
6d2493b 
CentOS 7 is going EOL on June 30, after which its package repos will no
longer exist on the regular mirrors. We'll still be able to access
packages from the vault server though, and can start doing so now. This
affects `dist-i686-linux` and `dist-x86_64-linux`.

I also removed `epel-release` because we were only using that for its
`cmake3`, but we've been building our own version for a while.
@onur-ozkan
extend the check for LLVM build
58e3ac0 
We don't build LLVM when using the precompiled version from the CI builder.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
@matthiaskrgr
Rollup merge of rust-lang#125293 - dingxiangfei2009:tail-expr-temp-li…
a61039f 
…fetime, r=estebank,davidtwco

Place tail expression behind terminating scope

This PR implements rust-lang#123739 so that we can do further experiments in nightly.

A little rewrite has been applied to `for await` lowering. It was previously `unsafe { Pin::unchecked_new(into_async_iter(..)) }`. Under the edition 2024 rule, however, `into_async_iter` gets dropped at the end of the `unsafe` block. This presumably the first Edition 2024 migration rule goes by hoisting `into_async_iter(..)` into `match` one level above, so it now looks like the following.
```rust
match into_async_iter($iter_expr) {
  ref mut iter => match unsafe { Pin::unchecked_new(iter) } {
    ...
  }
}
```
@matthiaskrgr
Rollup merge of rust-lang#125722 - Urgau:non_local_defs-macro-to-chan…
3e8c6e5 
…ge, r=estebank

Indicate in `non_local_defs` lint that the macro needs to change

This PR adds a note to indicate that the macro needs to change in the `non_local_definitions` lint output.

Address rust-lang#125089 (comment)
Fixes rust-lang#125681
r? ``@estebank``
@matthiaskrgr
Rollup merge of rust-lang#126192 - bjorn3:redox_patches, r=petrochenkov
0f24282 
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`
@matthiaskrgr
Rollup merge of rust-lang#126285 - kpreid:unique-rc, r=dtolnay
f588771 
`UniqueRc`: support allocators and `T: ?Sized`.

Added the following (all unstable):

* Defaulted type pararameter `A: Allocator`.
* `UniqueRc::new_in()`.
* `T:  ?Sized` where possible.
* `impl CoerceUnsized for UniqueRc`.

These changes are motivated by supporting the implementation of unsized `Rc::make_mut()` (PR rust-lang#116113), but are also intended to be obvious generalizations of `UniqueRc` to support the things `Rc` does.

r? ````@the8472````
@matthiaskrgr
Rollup merge of rust-lang#126352 - cuviper:centos7-vault, r=Kobzol
471e58a 
ci: Update centos:7 to use vault repos

CentOS 7 is going EOL on June 30, after which its package repos will no
longer exist on the regular mirrors. We'll still be able to access
packages from the vault server though, and can start doing so now. This
affects `dist-i686-linux` and `dist-x86_64-linux`.

I also removed `epel-release` because we were only using that for its
`cmake3`, but we've been building our own version for a while.

try-job: dist-i686-linux
try-job: dist-x86_64-linux
@matthiaskrgr
Rollup merge of rust-lang#126399 - onur-ozkan:126156, r=albertlarsan68
206f486 
extend the check for LLVM build

We don't build LLVM when using the precompiled version from the CI builder.

Closes rust-lang#126156
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure 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 14, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Jun 14, 2024

📌 Commit 206f486 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 Jun 14, 2024
@bors
Copy link
Contributor

bors commented Jun 14, 2024

⌛ Testing commit 206f486 with merge 46fb648...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 14, 2024
@bors
Auto merge of rust-lang#126461 - matthiaskrgr:rollup-tepitxf, r=matth…
46fb648 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#125293 (Place tail expression behind terminating scope)
 - rust-lang#125722 (Indicate in `non_local_defs` lint that the macro needs to change)
 - rust-lang#126192 (Various Redox OS fixes and add i686 Redox OS target)
 - rust-lang#126285 (`UniqueRc`: support allocators and `T: ?Sized`.)
 - rust-lang#126352 (ci: Update centos:7 to use vault repos)
 - rust-lang#126399 (extend the check for LLVM build)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job test-various failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
failures:

---- [ui] tests/ui/lifetimes/tail-expr-lock-poisoning.rs#edition2021 stdout ----

error in revision `edition2021`: test run failed!
status: exit status: 134
command: cd "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/lifetimes/tail-expr-lock-poisoning.edition2021" && RUST_TEST_THREADS="4" "/wasmtime-v19.0.0-x86_64-linux/wasmtime" "run" "-C" "cache=n" "--dir" "." "--env" "RUSTC_BOOTSTRAP" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/lifetimes/tail-expr-lock-poisoning.edition2021/a.wasm"
--- stderr -------------------------------
thread 'main' panicked at /checkout/tests/ui/lifetimes/tail-expr-lock-poisoning.rs:13:9:
explicit panic
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
Error: failed to run main module `/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/lifetimes/tail-expr-lock-poisoning.edition2021/a.wasm`
Caused by:
    0: failed to invoke command default
    1: error while executing at wasm backtrace:
    1: error while executing at wasm backtrace:
           0: 0x3610 - a.wasm!__rust_start_panic
           1: 0x3566 - a.wasm!rust_panic
           2: 0x33cd - a.wasm!std::panicking::rust_panic_with_hook::h848742ca5b96d06f
           3:  0x2dc - a.wasm!std::panicking::begin_panic::{{closure}}::hf9de0e73b6fe8a20
           4:  0x2a1 - a.wasm!std::sys_common::backtrace::__rust_end_short_backtrace::hd2fd1b1a346cb516
           5:  0x337 - a.wasm!std::panicking::begin_panic::hed332b0cb71da235
           6:  0x3a0 - a.wasm!std::panicking::try::he5e8b0f059d9dc9a
           7:  0x53b - a.wasm!tail_expr_lock_poisoning::main::h1d9e511ccc9d08d4
           8:  0x2e8 - a.wasm!std::sys_common::backtrace::__rust_begin_short_backtrace::h42f3062356ebe3db
           9:  0x2f7 - a.wasm!std::rt::lang_start::{{closure}}::hbcd71908bdb5d159
          10: 0x1a39 - a.wasm!std::rt::lang_start_internal::h1dc7bf388248658f
          11:  0x574 - a.wasm!__main_void
          12:  0x259 - a.wasm!_start
    2: wasm trap: wasm `unreachable` instruction executed


---- [ui] tests/ui/lifetimes/tail-expr-lock-poisoning.rs#edition2024 stdout ----


error in revision `edition2024`: test run failed!
status: exit status: 134
command: cd "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/lifetimes/tail-expr-lock-poisoning.edition2024" && RUST_TEST_THREADS="4" "/wasmtime-v19.0.0-x86_64-linux/wasmtime" "run" "-C" "cache=n" "--dir" "." "--env" "RUSTC_BOOTSTRAP" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/lifetimes/tail-expr-lock-poisoning.edition2024/a.wasm"
--- stderr -------------------------------
thread 'main' panicked at /checkout/tests/ui/lifetimes/tail-expr-lock-poisoning.rs:13:9:
explicit panic
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
Error: failed to run main module `/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/lifetimes/tail-expr-lock-poisoning.edition2024/a.wasm`
Caused by:
    0: failed to invoke command default
    1: error while executing at wasm backtrace:
    1: error while executing at wasm backtrace:
           0: 0x32a7 - a.wasm!__rust_start_panic
           1: 0x31fd - a.wasm!rust_panic
           2: 0x3139 - a.wasm!std::panicking::rust_panic_with_hook::h848742ca5b96d06f
           3: 0x23f8 - a.wasm!std::panicking::begin_panic_handler::{{closure}}::h52a988c42a8e5ee5
           4: 0x2369 - a.wasm!std::sys_common::backtrace::__rust_end_short_backtrace::hee594db32d2d6372
           5: 0x2aef - a.wasm!rust_begin_unwind
           6: 0x782d - a.wasm!core::panicking::panic_fmt::h07fa8a415eacdaba
           7: 0x8394 - a.wasm!core::panicking::panic_explicit::h748cbb80c7abe392
           8:  0x2a7 - a.wasm!<tail_expr_lock_poisoning::PanicOnDrop as core::ops::drop::Drop>::drop::panic_cold_explicit::h0fd263d835eee94b
           9:  0x297 - a.wasm!tail_expr_lock_poisoning::main::h1d9e511ccc9d08d4
          10:  0x26d - a.wasm!std::sys_common::backtrace::__rust_begin_short_backtrace::h42f3062356ebe3db
          11:  0x27c - a.wasm!std::rt::lang_start::{{closure}}::hbcd71908bdb5d159
          12: 0x17a5 - a.wasm!std::rt::lang_start_internal::h1dc7bf388248658f
          13:  0x2e0 - a.wasm!__main_void
          14:  0x248 - a.wasm!_start
    2: wasm trap: wasm `unreachable` instruction executed



failures:

@bors
Copy link
Contributor

bors commented Jun 14, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 14, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 14, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup 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-infra Relevant to the infrastructure 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
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet