Skip to content

Rollup of 10 pull requests #90934

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

Merged
merged 22 commits into from
Nov 16, 2021
Merged

Rollup of 10 pull requests #90934

Changes from 3 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2bdd075
implement `Termination` for `Result<Infallible, E>`
ibraheemdev Sep 2, 2021
2433d37
simplify `impl Termination for Result<Infallible, E>`
ibraheemdev Sep 3, 2021
caf206b
Stabilize File::options()
workingjubilee May 27, 2021
181716a
compare between Path instead of str
tamaroning Nov 11, 2021
a24e2ed
Android is not GNU
cuviper Nov 12, 2021
2d46d1b
Rename WASI's `is_character_device` to `is_char_device`.
sunfishcode Nov 12, 2021
6323f92
Remove bigint_helper_methods for *signed* types
scottmcm Nov 13, 2021
94ca0b3
fix ICE on Miri/CTFE copy of half a pointer
RalfJung Nov 14, 2021
60595f7
disable portable SIMD tests in Miri
RalfJung Nov 14, 2021
ab5434f
Move some tests to more reasonable directories
c410-f3r Nov 14, 2021
c4884bb
Support having -Z and -C options with the same name
joshtriplett Oct 21, 2021
e35b7bb
Stabilize -Z strip as -C strip
joshtriplett Oct 21, 2021
73ec27d
Rollup merge of #85766 - workingjubilee:file-options, r=yaahc
JohnTitor Nov 16, 2021
c44455a
Rollup merge of #88601 - ibraheemdev:termination-result-infallible, r…
JohnTitor Nov 16, 2021
a0dc4ab
Rollup merge of #90058 - joshtriplett:stabilize-strip, r=wesleywiser
JohnTitor Nov 16, 2021
aaac528
Rollup merge of #90790 - tamaroning:fix-lib-std-test, r=Mark-Simulacrum
JohnTitor Nov 16, 2021
ed7ed5f
Rollup merge of #90834 - cuviper:android-gnu, r=petrochenkov
JohnTitor Nov 16, 2021
96cfc9e
Rollup merge of #90835 - sunfishcode:sunfishcode/wasi-char-device, r=…
JohnTitor Nov 16, 2021
12d5297
Rollup merge of #90837 - c410-f3r:testsssssss, r=petrochenkov
JohnTitor Nov 16, 2021
fb96ecc
Rollup merge of #90848 - scottmcm:remove-signed-bigint-helpers, r=jos…
JohnTitor Nov 16, 2021
fff9055
Rollup merge of #90892 - RalfJung:miri-partial-ptr-copy, r=oli-obk
JohnTitor Nov 16, 2021
35dd1f6
Rollup merge of #90909 - RalfJung:miri-no-portable-simd, r=workingjub…
JohnTitor Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions library/std/src/process.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ mod tests;

use crate::io::prelude::*;

use crate::convert::Infallible;
use crate::ffi::OsStr;
use crate::fmt;
use crate::fs;
Expand Down Expand Up @@ -2065,6 +2066,14 @@ impl<E: fmt::Debug> Termination for Result<!, E> {
}
}

#[unstable(feature = "termination_trait_lib", issue = "43301")]
impl<E: fmt::Debug> Termination for Result<Infallible, E> {
fn report(self) -> i32 {
let Err(err) = self;
Err::<!, _>(err).report()
}
}

#[unstable(feature = "termination_trait_lib", issue = "43301")]
impl Termination for ExitCode {
#[inline]
Expand Down