diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-04-06 23:06:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-06 23:06:08 +0200 |
| commit | d2697e31280bae9e85adda11b87e6fc76db0ed63 (patch) | |
| tree | 5552db7b99d93eefe3b88618fb32a2c500fb5aca /library/std/src/sys/unix/os.rs | |
| parent | bd92c7c6d77bc8d3fb95f3f2910ca196e29a009d (diff) | |
| parent | 6e16f9b10f676e87c5d31263759c3b9a65be0a35 (diff) | |
| download | rust-d2697e31280bae9e85adda11b87e6fc76db0ed63.tar.gz rust-d2697e31280bae9e85adda11b87e6fc76db0ed63.zip | |
Rollup merge of #95730 - m-ou-se:rwlock-case, r=Dylan-DPC
Rename RWLock to RwLock in std::sys. std::sync::RwLock is spelled with two capital letters, but std::sys's RWLock was spelled with three capital letters. This cleans that up and uses `RwLock` everywhere.
Diffstat (limited to 'library/std/src/sys/unix/os.rs')
| -rw-r--r-- | library/std/src/sys/unix/os.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/std/src/sys/unix/os.rs b/library/std/src/sys/unix/os.rs index 0b6cdb923bd..1be733ba106 100644 --- a/library/std/src/sys/unix/os.rs +++ b/library/std/src/sys/unix/os.rs @@ -20,7 +20,7 @@ use crate::str; use crate::sys::cvt; use crate::sys::fd; use crate::sys::memchr; -use crate::sys_common::rwlock::{StaticRWLock, StaticRWLockReadGuard}; +use crate::sys_common::rwlock::{StaticRwLock, StaticRwLockReadGuard}; use crate::vec; #[cfg(all(target_env = "gnu", not(target_os = "vxworks")))] @@ -481,9 +481,9 @@ pub unsafe fn environ() -> *mut *const *const c_char { ptr::addr_of_mut!(environ) } -static ENV_LOCK: StaticRWLock = StaticRWLock::new(); +static ENV_LOCK: StaticRwLock = StaticRwLock::new(); -pub fn env_read_lock() -> StaticRWLockReadGuard { +pub fn env_read_lock() -> StaticRwLockReadGuard { ENV_LOCK.read() } |
