diff options
| author | bors <bors@rust-lang.org> | 2021-05-05 14:15:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-05-05 14:15:19 +0000 |
| commit | 342db70ae4ecc3cd17e4fa6497f0a8d9534ccfeb (patch) | |
| tree | e18b3678cfc15269ce32a88a453f6c810a3c5194 /src/tools | |
| parent | 24acc388da2cdbe1ec79b6933402941b6fffb26b (diff) | |
| parent | 2173d8dbe67790e0054876de99fcbfafdb4f8ecd (diff) | |
| download | rust-342db70ae4ecc3cd17e4fa6497f0a8d9534ccfeb.tar.gz rust-342db70ae4ecc3cd17e4fa6497f0a8d9534ccfeb.zip | |
Auto merge of #84200 - CDirkx:os, r=m-ou-se
Move all `sys::ext` modules to `os` This PR moves all `sys::ext` modules to `os`, centralizing the location of all `os` code and simplifying the dependencies between `os` and `sys`. Because this also removes all uses `cfg_if!` on publicly exported items, where after #81969 there were still a few left, this should properly work around https://github.com/rust-analyzer/rust-analyzer/issues/6038. `@rustbot` label: +T-libs-impl
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/clippy/clippy_utils/src/paths.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/clippy/clippy_utils/src/paths.rs b/src/tools/clippy/clippy_utils/src/paths.rs index 5e6733a300f..1fa439639b2 100644 --- a/src/tools/clippy/clippy_utils/src/paths.rs +++ b/src/tools/clippy/clippy_utils/src/paths.rs @@ -101,7 +101,7 @@ pub const PARKING_LOT_RWLOCK_WRITE_GUARD: [&str; 2] = ["parking_lot", "RwLockWri pub const PATH_BUF_AS_PATH: [&str; 4] = ["std", "path", "PathBuf", "as_path"]; pub const PATH_TO_PATH_BUF: [&str; 4] = ["std", "path", "Path", "to_path_buf"]; pub const PERMISSIONS: [&str; 3] = ["std", "fs", "Permissions"]; -pub const PERMISSIONS_FROM_MODE: [&str; 7] = ["std", "sys", "unix", "ext", "fs", "PermissionsExt", "from_mode"]; +pub const PERMISSIONS_FROM_MODE: [&str; 7] = ["std", "os", "imp", "unix", "fs", "PermissionsExt", "from_mode"]; pub const POLL: [&str; 4] = ["core", "task", "poll", "Poll"]; pub const POLL_PENDING: [&str; 5] = ["core", "task", "poll", "Poll", "Pending"]; pub const POLL_READY: [&str; 5] = ["core", "task", "poll", "Poll", "Ready"]; |
