Rollup of 7 pull requests #93729

matthiaskrgr · 2022-02-07T05:46:46Z

Successful merges:

Make the pre-commit script pre-push instead #88313 (Make the pre-commit script pre-push instead)
Cleanup c_str.rs #92724 (Cleanup c_str.rs)
Add From<u8> for ExitCode #93445 (Add From for ExitCode)
Fix linking stage1 toolchain in ./x.py setup #93487 (Fix linking stage1 toolchain in ./x.py setup)
Add more *-unwind ABI variants #93561 (Add more *-unwind ABI variants)
Drop json::from_reader #93680 (Drop json::from_reader)
Update tracking issue for const_fn_trait_bound #93682 (Update tracking issue for const_fn_trait_bound)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

This should make it substantially less annoying, and hopefully more people will find it useful. In particular, it will no longer run tidy each time you run `git commit --amend` or rebase a branch. This also warns if you have the old script in pre-commit; see the HACK comment for details.

The following *-unwind ABIs are now supported: - "C-unwind" - "cdecl-unwind" - "stdcall-unwind" - "fastcall-unwind" - "vectorcall-unwind" - "thiscall-unwind" - "aapcs-unwind" - "win64-unwind" - "sysv64-unwind" - "system-unwind"

Performing UTF-8 decode outside the JSON module makes more sense in almost all cases.

It previously pointed to rust-lang#57563, the conglomerate issue for `const fn` (presumably under the feature gate `const_fn`). `const_fn_trait_bounds` weren't mentioned here, so this commit changes its tracking issue to a new one.

Signed-off-by: Inteon <42113979+inteon@users.noreply.github.com>

This should cover a mostly cross-platform subset of supported exit codes.

Make the pre-commit script pre-push instead This should make it substantially less annoying, and hopefully more people will find it useful. In particular, it will no longer run tidy each time you run `git commit --amend` or rebase a branch. This also warns if you have the old script in pre-commit; see the HACK comment for details. r? `@Mark-Simulacrum` cc `@caass`

Cleanup c_str.rs Some code cleanups in `c_str.rs`. No functional changes. ref: bytecodealliance/rustix#163

Add From<u8> for ExitCode This should cover a mostly cross-platform subset of supported exit codes. We decided to stick with `u8` initially since its the common subset between all platforms that we support (excluding wasm which I think only works with `true` or `false`). Posix is supposed to take i32s, but in practice many unix platforms mask out all but the low 8 bits or in some cases the 8-15th bits. Windows takes a u32 instead of an i32. Bourne-compatible shells also report signals as exitcode 128 + `signal_no`, so there's some ambiguity there when returning exit codes > 127, but it is possible to disambiguate them on the other side so we decided against restricting the possible codes further than to `u8`. ## Related - Detailed analysis of exit code support on various platforms: https://internals.rust-lang.org/t/mini-pre-rfc-redesigning-process-exitstatus/5426 - rust-lang#48711 - rust-lang#43301 - https://rust-lang.zulipchat.com/#narrow/stream/219381-t-libs/topic/Termination.2FExit.20Status.20Stabilization

…etup, r=Mark-Simulacrum Fix linking stage1 toolchain in `./x.py setup` Closes [92319](rust-lang#92319) Fix linking stage1 toolchain in `./x.py setup`. I guess this can be considered a follow up to rust-lang#89212 by ``@Sl1mb0.`` We create 2 directories and 1 file that are required by rustup to [link a custom toolchain from path](https://github.com/rust-lang/rustup/blob/5225e87a5d974ab5f1626bcb2a7b43f76ab883f0/src/toolchain.rs#L479-L497). cc ``@jyn514`` and ``@Mark-Simulacrum`` as they were active in rust-lang#89206

Add more *-unwind ABI variants The following *-unwind ABIs are now supported: - "C-unwind" - "cdecl-unwind" - "stdcall-unwind" - "fastcall-unwind" - "vectorcall-unwind" - "thiscall-unwind" - "aapcs-unwind" - "win64-unwind" - "sysv64-unwind" - "system-unwind" cc ``````@rust-lang/wg-ffi-unwind``````

…=bjorn3 Drop json::from_reader Just a small cleanup -- this was essentially unused; the one use site is better suited to reading from &str regardless.

…s-const_fn_trait_bound, r=oli-obk Update tracking issue for `const_fn_trait_bound` It previously pointed to rust-lang#57563, the conglomerate issue for `const fn` (presumably under the feature gate `const_fn`). This tracking issue doesn't mention anything about `const_fn_trait_bound`(the only occurrence of "trait bound" is for the now-removed `?const Trait` syntax), which can be confusing to people who want to find out more about trait bounds on `const fn`s. This pull request changes the tracking issue to one meant specifically for `const_fn_trait_bound`, rust-lang#93706, which can help collect information on this feature's stabilization and point users towards `const_trait_impl` if they're looking for const-in-const-contexts trait bounds. Fixes rust-lang#93679. ``@rustbot`` modify labels +A-const-fn +F-const_trait_impl

matthiaskrgr · 2022-02-07T05:47:02Z

@bors r+ rollup=never p=7

bors · 2022-02-07T05:47:03Z

📌 Commit 8e3d04f has been approved by matthiaskrgr

bors · 2022-02-07T06:42:32Z

⌛ Testing commit 8e3d04f with merge 55b1ffa8afe8ec51bbb91f41abd57932d5886756...

rust-log-analyzer · 2022-02-07T07:01:22Z

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)

169 |             1..255 => Self::FAILURE,
    |             ^^^^^^
    |
    = note: see issue #37854 <https://github.com/rust-lang/rust/issues/37854> for more information
    = help: add `#![feature(exclusive_range_pattern)]` to the crate attributes to enable
For more information about this error, try `rustc --explain E0658`.
[RUSTC-TIMING] std test:false 1.271
warning: `std` (lib) generated 1 warning
error: could not compile `std` due to previous error; 1 warning emitted

bors · 2022-02-07T07:02:19Z

💔 Test failed - checks-actions

Urgau · 2022-02-07T10:30:14Z

@matthiaskrgr I think the build error comes from #93445 who added some From impl to ExitCode but probably did changed the one for the unsupported targets.

jyn514 and others added 14 commits August 24, 2021 19:55

Add more *-unwind ABI variants

547b4e6

The following *-unwind ABIs are now supported: - "C-unwind" - "cdecl-unwind" - "stdcall-unwind" - "fastcall-unwind" - "vectorcall-unwind" - "thiscall-unwind" - "aapcs-unwind" - "win64-unwind" - "sysv64-unwind" - "system-unwind"

Drop json::from_reader

0fb2b7a

Performing UTF-8 decode outside the JSON module makes more sense in almost all cases.

fix linking stage1 toolchain in setup

a4112dc

Fix tracking issue for const_fn_trait_bound

57b102f

It previously pointed to rust-lang#57563, the conglomerate issue for `const fn` (presumably under the feature gate `const_fn`). `const_fn_trait_bounds` weren't mentioned here, so this commit changes its tracking issue to a new one.

rewrite from_bytes_with_nul to match code style in from_vec_with_nul

afb7a50

Signed-off-by: Inteon <42113979+inteon@users.noreply.github.com>

Add From<u8> for ExitCode

cf4ac6b

This should cover a mostly cross-platform subset of supported exit codes.

Rollup merge of rust-lang#92724 - inteon:cleanup, r=Mark-Simulacrum

db51756

Cleanup c_str.rs Some code cleanups in `c_str.rs`. No functional changes. ref: bytecodealliance/rustix#163

Rollup merge of rust-lang#93680 - Mark-Simulacrum:drop-json-reader, r…

edf304c

…=bjorn3 Drop json::from_reader Just a small cleanup -- this was essentially unused; the one use site is better suited to reading from &str regardless.

rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Feb 7, 2022

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 7, 2022

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 Feb 7, 2022

matthiaskrgr mentioned this pull request Feb 7, 2022

Add more *-unwind ABI variants #93561

Merged

matthiaskrgr closed this Feb 7, 2022

matthiaskrgr deleted the rollup-muktucj branch February 13, 2022 00:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests #93729

Rollup of 7 pull requests #93729

Uh oh!

matthiaskrgr commented Feb 7, 2022

Uh oh!

matthiaskrgr commented Feb 7, 2022

Uh oh!

bors commented Feb 7, 2022

Uh oh!

bors commented Feb 7, 2022

Uh oh!

rust-log-analyzer commented Feb 7, 2022

Uh oh!

bors commented Feb 7, 2022

Uh oh!

Urgau commented Feb 7, 2022

Uh oh!

Uh oh!

Rollup of 7 pull requests #93729

Rollup of 7 pull requests #93729

Uh oh!

Conversation

matthiaskrgr commented Feb 7, 2022

Uh oh!

matthiaskrgr commented Feb 7, 2022

Uh oh!

bors commented Feb 7, 2022

Uh oh!

bors commented Feb 7, 2022

Uh oh!

rust-log-analyzer commented Feb 7, 2022

Uh oh!

bors commented Feb 7, 2022

Uh oh!

Urgau commented Feb 7, 2022

Uh oh!

Uh oh!