Rollup of 6 pull requests #102230

Dylan-DPC · 2022-09-24T10:10:13Z

Successful merges:

Add IsTerminal trait to determine if a descriptor or handle is a terminal #98033 (Add IsTerminal trait to determine if a descriptor or handle is a terminal)
Refactor some std code that works with pointer offstes #100823 (Refactor some std code that works with pointer offstes)
Fix wrongly refactored Lift impl #102088 (Fix wrongly refactored Lift impl)
Add const_closure, Constify Try trait #102186 (Add const_closure, Constify Try trait)
rustdoc: remove no-op CSS #source-sidebar { z-index } #102203 (rustdoc: remove no-op CSS #source-sidebar { z-index })
diagnostics: avoid syntactically invalid suggestion in if conditionals #102210 (diagnostics: avoid syntactically invalid suggestion in if conditionals)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…ls/alloc.rs` nicer - Use `.addr()` instead of `as`-cast - Use `add` instead of `offset` and remove some `as isize` casts by doing that - Remove some casts

…rminal The UNIX and WASI implementations use `isatty`. The Windows implementation uses the same logic the `atty` crate uses, including the hack needed to detect msys terminals. Implement this trait for `File` and for `Stdin`/`Stdout`/`Stderr` and their locked counterparts on all platforms. On UNIX and WASI, implement it for `BorrowedFd`/`OwnedFd`. On Windows, implement it for `BorrowedHandle`/`OwnedHandle`. Based on rust-lang#91121 Co-authored-by: Matt Wilkinson <mattwilki17@gmail.com>

If a process has no console, it'll have NULL in place of a console handle, so return early with `false` in that case without making any OS calls.

Rather than referencing a slice's pointer and then creating a new slice with a longer length, offset from the base structure pointer instead. This makes some choices of Rust semantics happier.

…n allocations

This rule became redundant in 07e3f99. When `#source-sidebar` became nested below `.sidebar`, it went from being `position: fixed` to `position: static`, and according to MDN's [z-index] documentation, this means it has no effect. [z-index]: https://developer.mozilla.org/en-US/docs/Web/CSS/z-index

Fixes rust-lang#101065

… r=thomcc Add `IsTerminal` trait to determine if a descriptor or handle is a terminal The UNIX implementation uses `isatty`. The Windows implementation uses the same logic the `atty` crate uses, including the hack needed to detect msys terminals. Implement this trait for `Stdin`/`Stdout`/`Stderr`/`File` on all platforms. On Unix, implement it for `BorrowedFd`/`OwnedFd`. On Windows, implement it for `BorrowedHandle`/`OwnedHandle`. Based on rust-lang#91121 Co-authored-by: Matt Wilkinson <mattwilki17@gmail.com>

Refactor some `std` code that works with pointer offstes This PR replaces `pointer::offset` in standard library with `pointer::add` and `pointer::sub`, [re]moving some casts and using `.addr()` while we are at it. This is a more complicated refactor than all other sibling PRs, so take a closer look when reviewing, please 😃 (though I've checked this multiple times and it looks fine). r? ```@scottmcm``` _split off from rust-lang#100746, continuation of #100822_

Fix wrongly refactored Lift impl see rust-lang#101858 (comment) r? `@bjorn3`

…=fee1-dead Add const_closure, Constify Try trait Adds a struct for creating const `FnMut` closures (for now just copy pasted form my [const_closure](https://crates.io/crates/const_closure) crate). I'm not sure if this way is how it should be done. The `ConstFnClosure` and `ConstFnOnceClosure` structs can probably also be entirely removed. This is then used to constify the try trait. Not sure if i should add const_closure in its own pr and maybe make it public behind a perma-unstable feature gate. cc ``@fee1-dead`` ``@rust-lang/wg-const-eval``

…, r=GuillaumeGomez rustdoc: remove no-op CSS `#source-sidebar { z-index }` This rule became redundant in 07e3f99. When `#source-sidebar` became nested below `.sidebar`, it went from being `position: fixed` to `position: static`, and according to MDN's [z-index] documentation, this means it has no effect. [z-index]: https://developer.mozilla.org/en-US/docs/Web/CSS/z-index

…r=cjgillot diagnostics: avoid syntactically invalid suggestion in if conditionals Fixes rust-lang#101065

Dylan-DPC · 2022-09-24T10:14:27Z

@bors r+ rollup=never p=5

bors · 2022-09-24T10:14:29Z

📌 Commit 7414529 has been approved by Dylan-DPC

It is now in the queue for this repository.

bors · 2022-09-24T11:56:14Z

⌛ Testing commit 7414529 with merge 969ffad567dcced557176863d52cf9748629707f...

bors · 2022-09-24T12:17:48Z

💔 Test failed - checks-actions

rust-log-analyzer · 2022-09-25T05:12:21Z

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

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

[RUSTC-TIMING] gimli test:false 4.515
[RUSTC-TIMING] object test:false 5.293
warning: dropping unsupported crate type `dylib` for target `wasm32-wasi`

error[E0277]: the trait bound `io::stdio::Stdin: owned::AsFd` is not satisfied
     |
1034 | / macro_rules! impl_is_terminal {
1034 | / macro_rules! impl_is_terminal {
1035 | |     ($($t:ty),*$(,)?) => {$(
1036 | |         #[unstable(feature = "sealed", issue = "none")]
1037 | |         impl crate::sealed::Sealed for $t {}
1043 | |                 crate::sys::io::is_terminal(self)
1043 | |                 crate::sys::io::is_terminal(self)
     | |                 --------------------------- ^^^^ the trait `owned::AsFd` is not implemented for `io::stdio::Stdin`
     | |                 required by a bound introduced by this call
...    |
1046 | |     )*}
1047 | | }
1047 | | }
     | |_- in this expansion of `impl_is_terminal!`
1048 |
1049 |   impl_is_terminal!(File, Stdin, StdinLock<'_>, Stdout, StdoutLock<'_>, Stderr, StderrLock<'_>);
     |
     |
     = help: the following other types implement trait `owned::AsFd`:
               &T
               Arc<T>
               Box<T>
               Socket
               WasiFd
               WasiFd
               fs::File
               owned::BorrowedFd<'_>
note: required by a bound in `is_terminal`
    --> library/std/src/sys/wasi/io.rs:77:30
     |
     |
77   | pub fn is_terminal(fd: &impl AsFd) -> bool {
     |                              ^^^^ required by this bound in `is_terminal`

error[E0277]: the trait bound `StdinLock<'_>: owned::AsFd` is not satisfied
     |
1034 | / macro_rules! impl_is_terminal {
1034 | / macro_rules! impl_is_terminal {
1035 | |     ($($t:ty),*$(,)?) => {$(
1036 | |         #[unstable(feature = "sealed", issue = "none")]
1037 | |         impl crate::sealed::Sealed for $t {}
1043 | |                 crate::sys::io::is_terminal(self)
1043 | |                 crate::sys::io::is_terminal(self)
     | |                 --------------------------- ^^^^ the trait `owned::AsFd` is not implemented for `StdinLock<'_>`
     | |                 required by a bound introduced by this call
...    |
1046 | |     )*}
1047 | | }
1047 | | }
     | |_- in this expansion of `impl_is_terminal!`
1048 |
1049 |   impl_is_terminal!(File, Stdin, StdinLock<'_>, Stdout, StdoutLock<'_>, Stderr, StderrLock<'_>);
     |
     |
     = help: the following other types implement trait `owned::AsFd`:
               &T
               Arc<T>
               Box<T>
               Socket
               WasiFd
               WasiFd
               fs::File
               owned::BorrowedFd<'_>
note: required by a bound in `is_terminal`
    --> library/std/src/sys/wasi/io.rs:77:30
     |
     |
77   | pub fn is_terminal(fd: &impl AsFd) -> bool {
     |                              ^^^^ required by this bound in `is_terminal`

error[E0277]: the trait bound `io::stdio::Stdout: owned::AsFd` is not satisfied
     |
1034 | / macro_rules! impl_is_terminal {
1034 | / macro_rules! impl_is_terminal {
1035 | |     ($($t:ty),*$(,)?) => {$(
1036 | |         #[unstable(feature = "sealed", issue = "none")]
1037 | |         impl crate::sealed::Sealed for $t {}
1043 | |                 crate::sys::io::is_terminal(self)
1043 | |                 crate::sys::io::is_terminal(self)
     | |                 --------------------------- ^^^^ the trait `owned::AsFd` is not implemented for `io::stdio::Stdout`
     | |                 required by a bound introduced by this call
...    |
1046 | |     )*}
1047 | | }
1047 | | }
     | |_- in this expansion of `impl_is_terminal!`
1048 |
1049 |   impl_is_terminal!(File, Stdin, StdinLock<'_>, Stdout, StdoutLock<'_>, Stderr, StderrLock<'_>);
     |
     |
     = help: the following other types implement trait `owned::AsFd`:
               &T
               Arc<T>
               Box<T>
               Socket
               WasiFd
               WasiFd
               fs::File
               owned::BorrowedFd<'_>
note: required by a bound in `is_terminal`
    --> library/std/src/sys/wasi/io.rs:77:30
     |
     |
77   | pub fn is_terminal(fd: &impl AsFd) -> bool {
     |                              ^^^^ required by this bound in `is_terminal`

error[E0277]: the trait bound `StdoutLock<'_>: owned::AsFd` is not satisfied
     |
1034 | / macro_rules! impl_is_terminal {
1034 | / macro_rules! impl_is_terminal {
1035 | |     ($($t:ty),*$(,)?) => {$(
1036 | |         #[unstable(feature = "sealed", issue = "none")]
1037 | |         impl crate::sealed::Sealed for $t {}
1043 | |                 crate::sys::io::is_terminal(self)
1043 | |                 crate::sys::io::is_terminal(self)
     | |                 --------------------------- ^^^^ the trait `owned::AsFd` is not implemented for `StdoutLock<'_>`
     | |                 required by a bound introduced by this call
...    |
1046 | |     )*}
1047 | | }
1047 | | }
     | |_- in this expansion of `impl_is_terminal!`
1048 |
1049 |   impl_is_terminal!(File, Stdin, StdinLock<'_>, Stdout, StdoutLock<'_>, Stderr, StderrLock<'_>);
     |
     |
     = help: the following other types implement trait `owned::AsFd`:
               &T
               Arc<T>
               Box<T>
               Socket
               WasiFd
               WasiFd
               fs::File
               owned::BorrowedFd<'_>
note: required by a bound in `is_terminal`
    --> library/std/src/sys/wasi/io.rs:77:30
     |
     |
77   | pub fn is_terminal(fd: &impl AsFd) -> bool {
     |                              ^^^^ required by this bound in `is_terminal`

error[E0277]: the trait bound `io::stdio::Stderr: owned::AsFd` is not satisfied
     |
1034 | / macro_rules! impl_is_terminal {
1034 | / macro_rules! impl_is_terminal {
1035 | |     ($($t:ty),*$(,)?) => {$(
1036 | |         #[unstable(feature = "sealed", issue = "none")]
1037 | |         impl crate::sealed::Sealed for $t {}
1043 | |                 crate::sys::io::is_terminal(self)
1043 | |                 crate::sys::io::is_terminal(self)
     | |                 --------------------------- ^^^^ the trait `owned::AsFd` is not implemented for `io::stdio::Stderr`
     | |                 required by a bound introduced by this call
...    |
1046 | |     )*}
1047 | | }
1047 | | }
     | |_- in this expansion of `impl_is_terminal!`
1048 |
1049 |   impl_is_terminal!(File, Stdin, StdinLock<'_>, Stdout, StdoutLock<'_>, Stderr, StderrLock<'_>);
     |
     |
     = help: the following other types implement trait `owned::AsFd`:
               &T
               Arc<T>
               Box<T>
               Socket
               WasiFd
               WasiFd
               fs::File
               owned::BorrowedFd<'_>
note: required by a bound in `is_terminal`
    --> library/std/src/sys/wasi/io.rs:77:30
     |
     |
77   | pub fn is_terminal(fd: &impl AsFd) -> bool {
     |                              ^^^^ required by this bound in `is_terminal`

error[E0277]: the trait bound `StderrLock<'_>: owned::AsFd` is not satisfied
     |
1034 | / macro_rules! impl_is_terminal {
1034 | / macro_rules! impl_is_terminal {
1035 | |     ($($t:ty),*$(,)?) => {$(
1036 | |         #[unstable(feature = "sealed", issue = "none")]
1037 | |         impl crate::sealed::Sealed for $t {}
1043 | |                 crate::sys::io::is_terminal(self)
1043 | |                 crate::sys::io::is_terminal(self)
     | |                 --------------------------- ^^^^ the trait `owned::AsFd` is not implemented for `StderrLock<'_>`
     | |                 required by a bound introduced by this call
...    |
1046 | |     )*}
1047 | | }
1047 | | }
     | |_- in this expansion of `impl_is_terminal!`
1048 |
1049 |   impl_is_terminal!(File, Stdin, StdinLock<'_>, Stdout, StdoutLock<'_>, Stderr, StderrLock<'_>);
     |
     |
     = help: the following other types implement trait `owned::AsFd`:
               &T
               Arc<T>
               Box<T>
               Socket
               WasiFd
               WasiFd
               fs::File
               owned::BorrowedFd<'_>
note: required by a bound in `is_terminal`
    --> library/std/src/sys/wasi/io.rs:77:30
     |
     |
77   | pub fn is_terminal(fd: &impl AsFd) -> bool {
     |                              ^^^^ required by this bound in `is_terminal`
For more information about this error, try `rustc --explain E0277`.
[RUSTC-TIMING] std test:false 2.345
warning: `std` (lib) generated 1 warning
error: could not compile `std` due to 6 previous errors; 1 warning emitted

WaffleLapkin and others added 24 commits September 4, 2022 17:27

Make code worling w/ pointers in `library/std/src/sys/sgx/abi/usercal…

a2cdbf8

…ls/alloc.rs` nicer - Use `.addr()` instead of `as`-cast - Use `add` instead of `offset` and remove some `as isize` casts by doing that - Remove some casts

use pointer::add in memchr impl

495fa48

Replace offset with add in fmt/num.rs & remove some casts

31b7181

Make is_terminal fail fast if a process has no console at all

0fb1bf0

If a process has no console, it'll have NULL in place of a console handle, so return early with `false` in that case without making any OS calls.

Rewrite FILE_NAME_INFO handling to avoid enlarging slice reference

aa42c4d

Rather than referencing a slice's pointer and then creating a new slice with a longer length, offset from the base structure pointer instead. This makes some choices of Rust semantics happier.

Use Align8 to avoid misalignment if the allocator or Vec doesn't alig…

170a8de

…n allocations

Fix wrongly refactored Lift impl

3e6c9e5

Apply changes proposed in the review

98a3230

Added const_closure

0b2f717

Constifed Try trait

8e0ea60

Fixed Doc-Tests

53049f7

Added some spacing in const closure

6267c60

Remove unused ConstFn(Once)Closure structs.

d78bc41

Constify Residual behind const_try

84666af

diagnostics: avoid syntactically invalid suggestion in if conditionals

ac06d9c

Fixes rust-lang#101065

Rollup merge of rust-lang#102088 - oli-obk:cleanups, r=bjorn3

6a92d4e

Fix wrongly refactored Lift impl see rust-lang#101858 (comment) r? `@bjorn3`

Rollup merge of rust-lang#102210 - notriddle:notriddle/did-you-mean, …

7414529

…r=cjgillot diagnostics: avoid syntactically invalid suggestion in if conditionals Fixes rust-lang#101065

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 24, 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 Sep 24, 2022

matthiaskrgr mentioned this pull request Sep 24, 2022

Add IsTerminal trait to determine if a descriptor or handle is a terminal #98033

Merged

matthiaskrgr closed this Sep 24, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #102230

Rollup of 6 pull requests #102230

Dylan-DPC commented Sep 24, 2022

Dylan-DPC commented Sep 24, 2022

bors commented Sep 24, 2022

bors commented Sep 24, 2022

bors commented Sep 24, 2022

rust-log-analyzer commented Sep 25, 2022

Rollup of 6 pull requests #102230

Rollup of 6 pull requests #102230

Conversation

Dylan-DPC commented Sep 24, 2022

Dylan-DPC commented Sep 24, 2022

bors commented Sep 24, 2022

bors commented Sep 24, 2022

bors commented Sep 24, 2022

rust-log-analyzer commented Sep 25, 2022