diff options
| author | bors <bors@rust-lang.org> | 2021-09-15 09:30:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-09-15 09:30:00 +0000 |
| commit | e846f9c44f1e17cac66d7b75e2ca099c87a2dfcb (patch) | |
| tree | 59cf8c9410a0e87e88c06771b4e041fd25751e93 /src | |
| parent | cdeba02ff71416e014f7130f75166890688be986 (diff) | |
| parent | 9a3b1cfeb08db360b11dd313ab2907d3e8c45bb3 (diff) | |
| download | rust-e846f9c44f1e17cac66d7b75e2ca099c87a2dfcb.tar.gz rust-e846f9c44f1e17cac66d7b75e2ca099c87a2dfcb.zip | |
Auto merge of #88619 - GuillaumeGomez:simplify-std-os-reexports, r=Amanieu
Remove `cfg(doc)` from std::os module reexports to fix rustdoc linking issues Fixes https://github.com/rust-lang/rust/issues/88304. I tested it based on https://github.com/rust-lang/rust/pull/88292. Not sure if it's the best approach, but at least it makes thing a bit simpler. cc `@jyn514`
Diffstat (limited to 'src')
| -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 d7e46c2d3eb..80be4350c3c 100644 --- a/src/tools/clippy/clippy_utils/src/paths.rs +++ b/src/tools/clippy/clippy_utils/src/paths.rs @@ -104,7 +104,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", "os", "imp", "unix", "fs", "PermissionsExt", "from_mode"]; +pub const PERMISSIONS_FROM_MODE: [&str; 6] = ["std", "os", "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"]; |