Skip to content

Commit a0f58f7

Browse files
sunfishcodesunfishcode
committed
Inline the mod reorder modules.
These modules were effectively redundant since they contained `use super::*` and the following code contained `use reorder::*`.
1 parent 7e83dae commit a0f58f7

File tree

2 files changed

+349
-364
lines changed

2 files changed

+349
-364
lines changed

‎src/imp/linux_raw/arch/outline/nr_last.rs

Lines changed: 132 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -53,142 +53,137 @@ extern "C" {
5353
}
5454

5555
// Then we define inline wrapper functions that do the reordering.
56-
mod reorder {
57-
use super::*;
5856

59-
#[inline]
60-
#[must_use]
61-
pub(in crate::imp) unsafe fn syscall0_readonly(nr: SyscallNumber<'_>) -> RetReg<R0> {
62-
rustix_syscall0_nr_last(nr)
63-
}
64-
#[inline]
65-
#[must_use]
66-
pub(in crate::imp) unsafe fn syscall1(nr: SyscallNumber<'_>, a0: ArgReg<'_, A0>) -> RetReg<R0> {
67-
rustix_syscall1_nr_last(a0, nr)
68-
}
69-
#[inline]
70-
#[must_use]
71-
pub(in crate::imp) unsafe fn syscall1_readonly(
72-
nr: SyscallNumber<'_>,
73-
a0: ArgReg<'_, A0>,
74-
) -> RetReg<R0> {
75-
rustix_syscall1_nr_last(a0, nr)
76-
}
77-
#[inline]
78-
#[must_use]
79-
pub(in crate::imp) unsafe fn syscall1_noreturn(nr: SyscallNumber<'_>, a0: ArgReg<'_, A0>) -> ! {
80-
rustix_syscall1_noreturn_nr_last(a0, nr)
81-
}
82-
#[inline]
83-
#[must_use]
84-
pub(in crate::imp) unsafe fn syscall2(
85-
nr: SyscallNumber<'_>,
86-
a0: ArgReg<'_, A0>,
87-
a1: ArgReg<'_, A1>,
88-
) -> RetReg<R0> {
89-
rustix_syscall2_nr_last(a0, a1, nr)
90-
}
91-
#[inline]
92-
#[must_use]
93-
pub(in crate::imp) unsafe fn syscall2_readonly(
94-
nr: SyscallNumber<'_>,
95-
a0: ArgReg<'_, A0>,
96-
a1: ArgReg<'_, A1>,
97-
) -> RetReg<R0> {
98-
rustix_syscall2_nr_last(a0, a1, nr)
99-
}
100-
#[inline]
101-
#[must_use]
102-
pub(in crate::imp) unsafe fn syscall3(
103-
nr: SyscallNumber<'_>,
104-
a0: ArgReg<'_, A0>,
105-
a1: ArgReg<'_, A1>,
106-
a2: ArgReg<'_, A2>,
107-
) -> RetReg<R0> {
108-
rustix_syscall3_nr_last(a0, a1, a2, nr)
109-
}
110-
#[inline]
111-
#[must_use]
112-
pub(in crate::imp) unsafe fn syscall3_readonly(
113-
nr: SyscallNumber<'_>,
114-
a0: ArgReg<'_, A0>,
115-
a1: ArgReg<'_, A1>,
116-
a2: ArgReg<'_, A2>,
117-
) -> RetReg<R0> {
118-
rustix_syscall3_nr_last(a0, a1, a2, nr)
119-
}
120-
#[inline]
121-
#[must_use]
122-
pub(in crate::imp) unsafe fn syscall4(
123-
nr: SyscallNumber<'_>,
124-
a0: ArgReg<'_, A0>,
125-
a1: ArgReg<'_, A1>,
126-
a2: ArgReg<'_, A2>,
127-
a3: ArgReg<'_, A3>,
128-
) -> RetReg<R0> {
129-
rustix_syscall4_nr_last(a0, a1, a2, a3, nr)
130-
}
131-
#[inline]
132-
#[must_use]
133-
pub(in crate::imp) unsafe fn syscall4_readonly(
134-
nr: SyscallNumber<'_>,
135-
a0: ArgReg<'_, A0>,
136-
a1: ArgReg<'_, A1>,
137-
a2: ArgReg<'_, A2>,
138-
a3: ArgReg<'_, A3>,
139-
) -> RetReg<R0> {
140-
rustix_syscall4_nr_last(a0, a1, a2, a3, nr)
141-
}
142-
#[inline]
143-
#[must_use]
144-
pub(in crate::imp) unsafe fn syscall5(
145-
nr: SyscallNumber<'_>,
146-
a0: ArgReg<'_, A0>,
147-
a1: ArgReg<'_, A1>,
148-
a2: ArgReg<'_, A2>,
149-
a3: ArgReg<'_, A3>,
150-
a4: ArgReg<'_, A4>,
151-
) -> RetReg<R0> {
152-
rustix_syscall5_nr_last(a0, a1, a2, a3, a4, nr)
153-
}
154-
#[inline]
155-
#[must_use]
156-
pub(in crate::imp) unsafe fn syscall5_readonly(
157-
nr: SyscallNumber<'_>,
158-
a0: ArgReg<'_, A0>,
159-
a1: ArgReg<'_, A1>,
160-
a2: ArgReg<'_, A2>,
161-
a3: ArgReg<'_, A3>,
162-
a4: ArgReg<'_, A4>,
163-
) -> RetReg<R0> {
164-
rustix_syscall5_nr_last(a0, a1, a2, a3, a4, nr)
165-
}
166-
#[inline]
167-
#[must_use]
168-
pub(in crate::imp) unsafe fn syscall6(
169-
nr: SyscallNumber<'_>,
170-
a0: ArgReg<'_, A0>,
171-
a1: ArgReg<'_, A1>,
172-
a2: ArgReg<'_, A2>,
173-
a3: ArgReg<'_, A3>,
174-
a4: ArgReg<'_, A4>,
175-
a5: ArgReg<'_, A5>,
176-
) -> RetReg<R0> {
177-
rustix_syscall6_nr_last(a0, a1, a2, a3, a4, a5, nr)
178-
}
179-
#[inline]
180-
#[must_use]
181-
pub(in crate::imp) unsafe fn syscall6_readonly(
182-
nr: SyscallNumber<'_>,
183-
a0: ArgReg<'_, A0>,
184-
a1: ArgReg<'_, A1>,
185-
a2: ArgReg<'_, A2>,
186-
a3: ArgReg<'_, A3>,
187-
a4: ArgReg<'_, A4>,
188-
a5: ArgReg<'_, A5>,
189-
) -> RetReg<R0> {
190-
rustix_syscall6_nr_last(a0, a1, a2, a3, a4, a5, nr)
191-
}
57+
#[inline]
58+
#[must_use]
59+
pub(in crate::imp) unsafe fn syscall0_readonly(nr: SyscallNumber<'_>) -> RetReg<R0> {
60+
rustix_syscall0_nr_last(nr)
61+
}
62+
#[inline]
63+
#[must_use]
64+
pub(in crate::imp) unsafe fn syscall1(nr: SyscallNumber<'_>, a0: ArgReg<'_, A0>) -> RetReg<R0> {
65+
rustix_syscall1_nr_last(a0, nr)
66+
}
67+
#[inline]
68+
#[must_use]
69+
pub(in crate::imp) unsafe fn syscall1_readonly(
70+
nr: SyscallNumber<'_>,
71+
a0: ArgReg<'_, A0>,
72+
) -> RetReg<R0> {
73+
rustix_syscall1_nr_last(a0, nr)
74+
}
75+
#[inline]
76+
#[must_use]
77+
pub(in crate::imp) unsafe fn syscall1_noreturn(nr: SyscallNumber<'_>, a0: ArgReg<'_, A0>) -> ! {
78+
rustix_syscall1_noreturn_nr_last(a0, nr)
79+
}
80+
#[inline]
81+
#[must_use]
82+
pub(in crate::imp) unsafe fn syscall2(
83+
nr: SyscallNumber<'_>,
84+
a0: ArgReg<'_, A0>,
85+
a1: ArgReg<'_, A1>,
86+
) -> RetReg<R0> {
87+
rustix_syscall2_nr_last(a0, a1, nr)
88+
}
89+
#[inline]
90+
#[must_use]
91+
pub(in crate::imp) unsafe fn syscall2_readonly(
92+
nr: SyscallNumber<'_>,
93+
a0: ArgReg<'_, A0>,
94+
a1: ArgReg<'_, A1>,
95+
) -> RetReg<R0> {
96+
rustix_syscall2_nr_last(a0, a1, nr)
97+
}
98+
#[inline]
99+
#[must_use]
100+
pub(in crate::imp) unsafe fn syscall3(
101+
nr: SyscallNumber<'_>,
102+
a0: ArgReg<'_, A0>,
103+
a1: ArgReg<'_, A1>,
104+
a2: ArgReg<'_, A2>,
105+
) -> RetReg<R0> {
106+
rustix_syscall3_nr_last(a0, a1, a2, nr)
107+
}
108+
#[inline]
109+
#[must_use]
110+
pub(in crate::imp) unsafe fn syscall3_readonly(
111+
nr: SyscallNumber<'_>,
112+
a0: ArgReg<'_, A0>,
113+
a1: ArgReg<'_, A1>,
114+
a2: ArgReg<'_, A2>,
115+
) -> RetReg<R0> {
116+
rustix_syscall3_nr_last(a0, a1, a2, nr)
117+
}
118+
#[inline]
119+
#[must_use]
120+
pub(in crate::imp) unsafe fn syscall4(
121+
nr: SyscallNumber<'_>,
122+
a0: ArgReg<'_, A0>,
123+
a1: ArgReg<'_, A1>,
124+
a2: ArgReg<'_, A2>,
125+
a3: ArgReg<'_, A3>,
126+
) -> RetReg<R0> {
127+
rustix_syscall4_nr_last(a0, a1, a2, a3, nr)
128+
}
129+
#[inline]
130+
#[must_use]
131+
pub(in crate::imp) unsafe fn syscall4_readonly(
132+
nr: SyscallNumber<'_>,
133+
a0: ArgReg<'_, A0>,
134+
a1: ArgReg<'_, A1>,
135+
a2: ArgReg<'_, A2>,
136+
a3: ArgReg<'_, A3>,
137+
) -> RetReg<R0> {
138+
rustix_syscall4_nr_last(a0, a1, a2, a3, nr)
139+
}
140+
#[inline]
141+
#[must_use]
142+
pub(in crate::imp) unsafe fn syscall5(
143+
nr: SyscallNumber<'_>,
144+
a0: ArgReg<'_, A0>,
145+
a1: ArgReg<'_, A1>,
146+
a2: ArgReg<'_, A2>,
147+
a3: ArgReg<'_, A3>,
148+
a4: ArgReg<'_, A4>,
149+
) -> RetReg<R0> {
150+
rustix_syscall5_nr_last(a0, a1, a2, a3, a4, nr)
151+
}
152+
#[inline]
153+
#[must_use]
154+
pub(in crate::imp) unsafe fn syscall5_readonly(
155+
nr: SyscallNumber<'_>,
156+
a0: ArgReg<'_, A0>,
157+
a1: ArgReg<'_, A1>,
158+
a2: ArgReg<'_, A2>,
159+
a3: ArgReg<'_, A3>,
160+
a4: ArgReg<'_, A4>,
161+
) -> RetReg<R0> {
162+
rustix_syscall5_nr_last(a0, a1, a2, a3, a4, nr)
163+
}
164+
#[inline]
165+
#[must_use]
166+
pub(in crate::imp) unsafe fn syscall6(
167+
nr: SyscallNumber<'_>,
168+
a0: ArgReg<'_, A0>,
169+
a1: ArgReg<'_, A1>,
170+
a2: ArgReg<'_, A2>,
171+
a3: ArgReg<'_, A3>,
172+
a4: ArgReg<'_, A4>,
173+
a5: ArgReg<'_, A5>,
174+
) -> RetReg<R0> {
175+
rustix_syscall6_nr_last(a0, a1, a2, a3, a4, a5, nr)
176+
}
177+
#[inline]
178+
#[must_use]
179+
pub(in crate::imp) unsafe fn syscall6_readonly(
180+
nr: SyscallNumber<'_>,
181+
a0: ArgReg<'_, A0>,
182+
a1: ArgReg<'_, A1>,
183+
a2: ArgReg<'_, A2>,
184+
a3: ArgReg<'_, A3>,
185+
a4: ArgReg<'_, A4>,
186+
a5: ArgReg<'_, A5>,
187+
) -> RetReg<R0> {
188+
rustix_syscall6_nr_last(a0, a1, a2, a3, a4, a5, nr)
192189
}
193-
194-
pub(in crate::imp) use reorder::*;

0 commit comments

Comments
 (0)