Skip to content

Commit 0140785

Browse files
authored
Merge pull request #4162 from eduardosm/leading-colon-colon
Handle remaining leading `::` in paths
2 parents 8075133 + 82d30c6 commit 0140785

File tree

16 files changed

+254
-254
lines changed

16 files changed

+254
-254
lines changed

ci/style.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ fn check_style(file: &str, path: &Path, err: &mut Errors) {
115115
}
116116
}
117117
if line.contains("#[derive(") && (line.contains("Copy") || line.contains("Clone")) {
118-
err.error(path, i, "impl ::Copy and ::Clone manually");
118+
err.error(path, i, "impl Copy and Clone manually");
119119
}
120120
if line.contains("impl") {
121121
in_impl = true;

src/fuchsia/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2062,7 +2062,7 @@ pub const WEXITED: c_int = 0x00000004;
20622062
pub const WCONTINUED: c_int = 0x00000008;
20632063
pub const WNOWAIT: c_int = 0x01000000;
20642064

2065-
// ::Options set using PTRACE_SETOPTIONS.
2065+
// Options set using PTRACE_SETOPTIONS.
20662066
pub const PTRACE_O_TRACESYSGOOD: c_int = 0x00000001;
20672067
pub const PTRACE_O_TRACEFORK: c_int = 0x00000002;
20682068
pub const PTRACE_O_TRACEVFORK: c_int = 0x00000004;

src/teeos/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,7 @@ extern "C" {
11091109
pub fn pthread_cond_timedwait(
11101110
cond: *mut pthread_cond_t,
11111111
lock: *mut pthread_mutex_t,
1112-
abstime: *const ::timespec,
1112+
abstime: *const timespec,
11131113
) -> c_int;
11141114

11151115
pub fn pthread_mutexattr_setrobust(attr: *mut pthread_mutexattr_t, robustness: c_int) -> c_int;

src/unix/bsd/apple/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ s! {
359359
pub si_status: c_int,
360360
pub si_addr: *mut c_void,
361361
//Requires it to be union for tests
362-
//pub si_value: ::sigval,
362+
//pub si_value: crate::sigval,
363363
_pad: [usize; 9],
364364
}
365365

src/unix/bsd/netbsdlike/netbsd/riscv64.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ s! {
1414
pub struct mcontext_t {
1515
pub __gregs: __gregset,
1616
pub __fregs: __fpregset,
17-
__spare: [::__greg_t; 7],
17+
__spare: [crate::__greg_t; 7],
1818
}
1919
}
2020

@@ -26,7 +26,7 @@ s_no_extra_traits! {
2626
}
2727
}
2828

29-
pub(crate) const _ALIGNBYTES: usize = ::mem::size_of::<c_long>() - 1;
29+
pub(crate) const _ALIGNBYTES: usize = crate::mem::size_of::<c_long>() - 1;
3030

3131
pub const PT_GETREGS: c_int = PT_FIRSTMACH + 0;
3232
pub const PT_SETREGS: c_int = PT_FIRSTMACH + 1;

src/unix/bsd/netbsdlike/openbsd/arm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ pub type c_long = i32;
44
pub type c_ulong = u32;
55
pub type c_char = u8;
66

7-
pub(crate) const _ALIGNBYTES: usize = ::mem::size_of::<c_double>() - 1;
7+
pub(crate) const _ALIGNBYTES: usize = crate::mem::size_of::<c_double>() - 1;
88

99
pub const _MAX_PAGE_SHIFT: u32 = 12;

0 commit comments

Comments
 (0)