Rollup of 9 pull requests #121887

Dylan-DPC · 2024-03-02T08:03:41Z

Successful merges:

fix typo in documentation for std::fs::Permissions #109263 (fix typo in documentation for std::fs::Permissions)
Convert Unix{Datagram,Stream}::{set_}passcred() to per-OS traits #117156 (Convert Unix{Datagram,Stream}::{set_}passcred() to per-OS traits)
Update E0716.md for clarity #120684 (Update E0716.md for clarity)
Display short types for unimplemented trait #121739 (Display short types for unimplemented trait)
Move gather_comments. #121815 (Move gather_comments.)
Move HandleStore into server.rs. #121835 (Move HandleStore into server.rs.)
Remove hidden use of Global #121847 (Remove hidden use of Global)
Use the guaranteed precision of a couple of float functions in docs #121861 (Use the guaranteed precision of a couple of float functions in docs)
Account for unmet T: !Copy in E0277 message #121875 ( Account for unmet T: !Copy in E0277 message)

r? @ghost
@rustbot modify labels: rollup

These methods are the pre-stabilized API for obtaining peer credentials from an `AF_UNIX` socket, part of the `unix_socket_ancillary_data` feature. Their current behavior is to get/set one of the `SO_PASSCRED` (Linux), `LOCAL_CREDS_PERSISTENT` (FreeBSD), or `LOCAL_CREDS` (NetBSD) socket options. On other targets the `{set_}passcred()` methods do not exist. There are two problems with this approach: 1. Having public methods only exist for certain targets isn't permitted in a stable `std` API. 2. These options have generally similar purposes, but they are non-POSIX and their details can differ in subtle and surprising ways (such as whether they continue to be set after the next call to `recvmsg()`). Splitting into OS-specific extension traits is the preferred solution to both problems.

When reading through this, I got slightly hung up thinking the `let` it was referring to was the `let tmp` on line 25, which was confusing considering the comment states that the temporary is freed at the end of the block. I think adding this clarification could potentially help some beginners like myself without being overly verbose.

To the module where it is used, so it doesn't have to be `pub`.

This just moves the server-relevant parts of handles into `server.rs`. It introduces a new higher-order macro `with_api_handle_types` to avoid some duplication. This fixes two `FIXME` comments, and makes things clearer, by not having server code in `client.rs`.

Clearer wording

fix typo in documentation for std::fs::Permissions Please check and re-check this PR carefully to see if I got this right. But by my logic, if the `read_only` function returns `true`, I would not expect be able to write to the file (it being read only); so this text is meant to clarify that `read_only` being `false` doesn't mean *you* can actually write to the file, just that "in general" someone is able to.

…anieu,dtolnay Convert `Unix{Datagram,Stream}::{set_}passcred()` to per-OS traits These methods are the pre-stabilized API for obtaining peer credentials from an `AF_UNIX` socket, part of the `unix_socket_ancillary_data` feature. Their current behavior is to get/set one of the `SO_PASSCRED` (Linux), `LOCAL_CREDS_PERSISTENT` (FreeBSD), or `LOCAL_CREDS` (NetBSD) socket options. On other targets the `{set_}passcred()` methods do not exist. There are two problems with this approach: 1. Having public methods only exist for certain targets isn't permitted in a stable `std` API. 2. These options have generally similar purposes, but they are non-POSIX and their details can differ in subtle and surprising ways (such as whether they continue to be set after the next call to `recvmsg()`). Splitting into OS-specific extension traits is the preferred solution to both problems.

Update E0716.md for clarity When reading through this, I got slightly hung up thinking the `let` it was referring to was the `let tmp` on line 25, which was confusing considering the comment states that the temporary is freed at the end of the block. I think adding this clarification could potentially help some beginners like myself without being overly verbose.

Display short types for unimplemented trait Shortens unimplemented trait diagnostics. Now shows: ``` error[E0277]: `Option<Option<Option<...>>>` doesn't implement `std::fmt::Display` --> $DIR/on_unimplemented_long_types.rs:4:17 | LL | pub fn foo() -> impl std::fmt::Display { | ^^^^^^^^^^^^^^^^^^^^^^ `Option<Option<Option<...>>>` cannot be formatted with the default formatter LL | LL | / Some(Some(Some(Some(Some(Some(Some(Some(Some(S... LL | | Some(Some(Some(Some(Some(Some(Some(Some(So... LL | | Some(Some(Some(Some(Some(Some(Some(Som... LL | | Some(Some(Some(Some(Some(Some(Some... ... | LL | | ))))))))))), LL | | ))))))))))) | |_______________- return type was inferred to be `Option<Option<Option<...>>>` here | = help: the trait `std::fmt::Display` is not implemented for `Option<Option<Option<...>>>` = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0277`. ``` I'm not 100% sure if this is desirable, or if we should just let the long types remain long. This is also kinda a short-term bandaid solution. The real long term solution is to properly migrate `rustc_trait_selection`'s error reporting to use translatable diagnostics and then properly handle type name printing. Fixes rust-lang#121687.

…est31 Move `gather_comments`. To the module where it is used, so it doesn't have to be `pub`. r? ``@est31``

Move `HandleStore` into `server.rs`. This just moves the server-relevant parts of handles into `server.rs`. It introduces a new higher-order macro `with_api_handle_types` to avoid some duplication. This fixes two `FIXME` comments, and makes things clearer, by not having server code in `client.rs`. r? ``@bjorn3``

…=cuviper Remove hidden use of Global Fixes rust-lang#121797

…les, r=workingjubilee Use the guaranteed precision of a couple of float functions in docs

…r-errors Account for unmet T: !Copy in E0277 message ``` error[E0277]: the trait bound `T: !Copy` is not satisfied --> $DIR/simple.rs:10:16 | LL | not_copy::<T>(); | ^ the trait bound `T: !Copy` is not satisfied ``` instead of the current ``` error[E0277]: the trait bound `T: !Copy` is not satisfied --> $DIR/simple.rs:10:16 | LL | not_copy::<T>(); | ^ the trait `!Copy` is not implemented for `T` ```

Dylan-DPC · 2024-03-02T08:04:01Z

@bors r+ rollup=never p=5

bors · 2024-03-02T08:04:03Z

📌 Commit a404b52 has been approved by Dylan-DPC

It is now in the queue for this repository.

bors · 2024-03-02T08:05:13Z

⌛ Testing commit a404b52 with merge cbd4772...

Rollup of 9 pull requests Successful merges: - rust-lang#109263 (fix typo in documentation for std::fs::Permissions) - rust-lang#117156 (Convert `Unix{Datagram,Stream}::{set_}passcred()` to per-OS traits) - rust-lang#120684 (Update E0716.md for clarity) - rust-lang#121739 (Display short types for unimplemented trait) - rust-lang#121815 (Move `gather_comments`.) - rust-lang#121835 (Move `HandleStore` into `server.rs`.) - rust-lang#121847 (Remove hidden use of Global) - rust-lang#121861 (Use the guaranteed precision of a couple of float functions in docs) - rust-lang#121875 ( Account for unmet T: !Copy in E0277 message) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2024-03-02T08:38:52Z

The job arm-android failed! Check out the build log: (web) (plain)

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

[RUSTC-TIMING] thread test:true 0.472
[RUSTC-TIMING] env test:true 0.968
[RUSTC-TIMING] allocbenches test:true 0.093
[RUSTC-TIMING] process_spawning test:true 0.798
error[E0433]: failed to resolve: could not find `linux` in `os`
   |
17 | use crate::os::linux::net::UnixSocketExt;
17 | use crate::os::linux::net::UnixSocketExt;
   |                ^^^^^ could not find `linux` in `os`
note: found an item that was configured out
  --> library/std/src/os/mod.rs:35:9
   |
35 | pub mod linux {}
---
[RUSTC-TIMING] stdbenches test:true 1.799
error[E0599]: no method named `set_passcred` found for struct `datagram::UnixDatagram` in the current scope
   --> library/std/src/os/unix/net/tests.rs:691:22
    |
691 |     or_panic!(bsock2.set_passcred(true));
    |
   ::: library/std/src/os/net/linux_ext/socket.rs:40:8
    |
40  |     fn set_passcred(&self, passcred: bool) -> io::Result<()>;

bors · 2024-03-02T08:39:26Z

💔 Test failed - checks-actions

squell and others added 24 commits March 17, 2023 14:33

fix typo in documentation for std::fs::Permissions

53469cf

rewording after comments by @thomcc

0df002a

remove potentially misleading sentence about libc::access

b353765

Display short types for unimplemented trait

c0ce0f3

Unify long type name file and note in note_obligation_cause_code

a1dbb61

Small clean up of E0277 message logic

d89c2c5

Move gather_comments.

69f2c9c

To the module where it is used, so it doesn't have to be `pub`.

remove hidden use of Global

fb8ac06

Use the guaranteed precision of a couple of float functions in docs

bcccab8

Avoid silently writing to a file when the involved ty is long

62baa67

Update E0716.md

50ff362

Clearer wording

Account for unmet T: !Copy in E0277 message

7f97dfe

Rollup merge of rust-lang#121815 - nnethercote:mv-gather_comments, r=…

0c46bc1

…est31 Move `gather_comments`. To the module where it is used, so it doesn't have to be `pub`. r? ``@est31``

Rollup merge of rust-lang#121847 - shamatar:btreemap_fix_implicits, r…

9c40705

…=cuviper Remove hidden use of Global Fixes rust-lang#121797

Rollup merge of rust-lang#121861 - tbu-:pr_floating_point_exact_examp…

8e8d5af

…les, r=workingjubilee Use the guaranteed precision of a couple of float functions in docs

rustbot added T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 2, 2024

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 Mar 2, 2024

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 Mar 2, 2024

Dylan-DPC mentioned this pull request Mar 2, 2024

Convert Unix{Datagram,Stream}::{set_}passcred() to per-OS traits #117156

Merged

Dylan-DPC closed this Mar 2, 2024

Dylan-DPC deleted the rollup-d00bdxz branch March 2, 2024 10:47

dtolnay mentioned this pull request Mar 11, 2024

Test Unix{Datagram,Stream}::{set_}passcred() on Android #122324

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #121887

Rollup of 9 pull requests #121887

Dylan-DPC commented Mar 2, 2024

Dylan-DPC commented Mar 2, 2024

bors commented Mar 2, 2024

bors commented Mar 2, 2024

rust-log-analyzer commented Mar 2, 2024

bors commented Mar 2, 2024

Rollup of 9 pull requests #121887

Rollup of 9 pull requests #121887

Conversation

Dylan-DPC commented Mar 2, 2024

Dylan-DPC commented Mar 2, 2024

bors commented Mar 2, 2024

bors commented Mar 2, 2024

rust-log-analyzer commented Mar 2, 2024

bors commented Mar 2, 2024