diff options
| author | Trevor Gross <t.gross35@gmail.com> | 2024-07-16 20:10:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-16 20:10:10 -0500 |
| commit | 606d8cf9e81702fc50aff3baa4154f90df68b261 (patch) | |
| tree | 62f8f1a112ceb02502f6bf0b75b399792b3c231c /library/std/src/sys/pal | |
| parent | fe1dc02163e001092ae4e7306ec30b05e9960657 (diff) | |
| parent | 7f0ccfe69d7c79ed84a7fb23081fd2d15434da62 (diff) | |
| download | rust-606d8cf9e81702fc50aff3baa4154f90df68b261.tar.gz rust-606d8cf9e81702fc50aff3baa4154f90df68b261.zip | |
Rollup merge of #126776 - nnethercote:rustfmt-use-pre-cleanups-2, r=cuviper
Clean up more comments near use declarations #125443 will reformat all use declarations in the repository. There are a few edge cases involving comments on use declarations that require care. This PR fixes them up so #125443 can go ahead with a simple `x fmt --all`. A follow-up to #126717. r? ``@cuviper``
Diffstat (limited to 'library/std/src/sys/pal')
| -rw-r--r-- | library/std/src/sys/pal/wasi/mod.rs | 9 | ||||
| -rw-r--r-- | library/std/src/sys/pal/wasip2/mod.rs | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/library/std/src/sys/pal/wasi/mod.rs b/library/std/src/sys/pal/wasi/mod.rs index 8dfb733043e..d8fe06d1973 100644 --- a/library/std/src/sys/pal/wasi/mod.rs +++ b/library/std/src/sys/pal/wasi/mod.rs @@ -39,12 +39,15 @@ pub mod time; #[deny(unsafe_op_in_unsafe_fn)] #[allow(unused)] mod common; + pub use common::*; mod helpers; -// These exports are listed individually to work around Rust's glob import -// conflict rules. If we glob export `helpers` and `common` together, then -// the compiler complains about conflicts. + +// The following exports are listed individually to work around Rust's glob +// import conflict rules. If we glob export `helpers` and `common` together, +// then the compiler complains about conflicts. + pub use helpers::abort_internal; pub use helpers::decode_error_kind; use helpers::err2io; diff --git a/library/std/src/sys/pal/wasip2/mod.rs b/library/std/src/sys/pal/wasip2/mod.rs index 7af0917b8ed..0930d2e22fa 100644 --- a/library/std/src/sys/pal/wasip2/mod.rs +++ b/library/std/src/sys/pal/wasip2/mod.rs @@ -41,13 +41,16 @@ pub mod time; #[deny(unsafe_op_in_unsafe_fn)] #[allow(unused)] mod common; + pub use common::*; #[path = "../wasi/helpers.rs"] mod helpers; -// These exports are listed individually to work around Rust's glob import -// conflict rules. If we glob export `helpers` and `common` together, then -// the compiler complains about conflicts. + +// The following exports are listed individually to work around Rust's glob +// import conflict rules. If we glob export `helpers` and `common` together, +// then the compiler complains about conflicts. + pub use helpers::abort_internal; pub use helpers::decode_error_kind; use helpers::err2io; |