Skip to content

Commit a739260

Browse files
committed
Default TCP and Unix sockets to SOCK_NONBLOCK, fix up new lints
1 parent ec7a8c9 commit a739260

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+936
-276
lines changed

.local/tiny-std-test.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/bin/sh
22
set -ex
3-
43
cargo test -p tiny-std --no-default-features
54
cargo test -p tiny-std --features threaded,global-allocator
65

76
cross test -p tiny-std --no-default-features --target aarch64-unknown-linux-gnu
8-
cross test -p tiny-std --target aarch64-unknown-linux-gnu --features threaded,global-allocator
7+
8+
cross test -p tiny-std --target aarch64-unknown-linux-gnu --features threaded,global-allocator
9+

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[workspace]
22
resolver = "2"
33
members = ["rusl", "tiny-cli", "tiny-start", "tiny-std"]
4-
exclude = ["test-runners/alloc-st-main", "test-runners/no-alloc-main", "test-runners/threaded-main", "test-runners/test-lib"]
4+
exclude = ["test-runners/alloc-st-main", "test-runners/no-alloc-main", "test-runners/threaded-main", "test-runners/test-lib"]
5+

rusl/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ integration-test = []
2121
linux-rust-bindings = { version = "0.1.3", features = ["all"] }
2222
sc = "0.2.7"
2323

24-
[dev-dependencies]
24+
[dev-dependencies]

rusl/src/futex.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub fn futex_wait(
1818
let res = unsafe {
1919
syscall!(
2020
FUTEX,
21-
uaddr as *const AtomicU32,
21+
core::ptr::from_ref::<AtomicU32>(uaddr),
2222
FUTEX_WAIT & flags.bits().0,
2323
val,
2424
timeout
@@ -41,7 +41,7 @@ pub fn futex_wake(uaddr: &AtomicU32, num_waiters: i32) -> Result<usize, Error> {
4141
let res = unsafe {
4242
syscall!(
4343
FUTEX,
44-
uaddr as *const AtomicU32,
44+
core::ptr::from_ref::<AtomicU32>(uaddr),
4545
FUTEX_WAKE,
4646
num_waiters,
4747
0,

rusl/src/io_uring.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ mod test;
2525
/// See the [linux documentation for details](https://man7.org/linux/man-pages//man2/io_uring_setup.2.html)
2626
/// # Errors
2727
/// See above
28-
#[allow(clippy::too_many_lines)]
28+
#[expect(clippy::too_many_lines)]
2929
pub fn setup_io_uring(
3030
entries: u32,
3131
flags: IoUringParamFlags,
@@ -173,7 +173,7 @@ pub fn io_uring_setup(entries: u32, io_uring_params: &mut IoUringParams) -> Resu
173173
syscall!(
174174
IO_URING_SETUP,
175175
entries,
176-
io_uring_params as *mut IoUringParams
176+
core::ptr::from_mut::<IoUringParams>(io_uring_params)
177177
)
178178
};
179179
Fd::coerce_from_register(res, "`IO_URING_SETUP` syscall failed")

rusl/src/io_uring/test.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ fn uring_register_buffer() {
7373
unsafe { io_uring_register_buffers(uring_fd, &[ioslice]).unwrap() };
7474
}
7575

76-
#[cfg_attr(target_arch = "x86_64", allow(clippy::unnecessary_wraps))]
76+
#[cfg_attr(target_arch = "x86_64", expect(clippy::unnecessary_wraps))]
7777
fn setup_ignore_enosys(entries: u32, flags: IoUringParamFlags) -> Option<IoUring> {
7878
let uring = setup_io_uring(entries, flags, 0, 0);
7979
match uring {
@@ -98,7 +98,7 @@ fn uring_setup_instance() {
9898
}
9999

100100
#[test]
101-
#[allow(clippy::cast_sign_loss)]
101+
#[expect(clippy::cast_sign_loss)]
102102
fn uring_single_read() {
103103
let Some(mut uring) = setup_ignore_enosys(8, IoUringParamFlags::empty()) else {
104104
return;
@@ -130,7 +130,7 @@ fn uring_single_read() {
130130
}
131131

132132
#[test]
133-
#[allow(clippy::cast_sign_loss)]
133+
#[expect(clippy::cast_sign_loss)]
134134
fn uring_single_write() {
135135
let Some(mut uring) = setup_ignore_enosys(8, IoUringParamFlags::empty()) else {
136136
return;
@@ -364,7 +364,7 @@ fn uring_single_socket() {
364364

365365
#[test]
366366
#[cfg(feature = "alloc")]
367-
#[allow(clippy::cast_sign_loss, clippy::too_many_lines)]
367+
#[expect(clippy::cast_sign_loss, clippy::too_many_lines)]
368368
fn uring_unix_accept_send_recv() {
369369
use crate::network::{bind_unix, connect_unix, listen, socket};
370370
let Some(mut uring) = setup_ignore_enosys(8, IoUringParamFlags::empty()) else {
@@ -491,7 +491,6 @@ fn uring_unix_accept_send_recv() {
491491

492492
#[test]
493493
#[cfg(feature = "alloc")]
494-
#[allow(clippy::cast_sign_loss, clippy::too_many_lines)]
495494
fn uring_tcp_accept() {
496495
use crate::network::{bind_inet, listen, socket};
497496
const FIFTEEN: crate::platform::NonNegativeI32 =
@@ -622,7 +621,7 @@ fn uring_single_timeout() {
622621
}
623622

624623
#[test]
625-
#[allow(clippy::cast_sign_loss)]
624+
#[expect(clippy::cast_sign_loss)]
626625
fn uring_read_registered_buffers_and_fds() {
627626
let mut buf1 = [0u8; 64];
628627
let buf1_addr = core::ptr::addr_of_mut!(buf1);
@@ -716,7 +715,7 @@ fn uring_read_registered_buffers_and_fds() {
716715
}
717716

718717
#[test]
719-
#[allow(clippy::too_many_lines)]
718+
#[expect(clippy::too_many_lines)]
720719
fn uring_write_registered_buffers_and_fds() {
721720
let content1 = b"Uring fixed write 1!\n";
722721
let mut buf1 = [0u8; 21];

rusl/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
#![allow(unused_doc_comments)]
1+
#![expect(unused_doc_comments)]
22
#![cfg_attr(not(test), no_std)]
33
#![warn(clippy::pedantic)]
4-
#![allow(
4+
#![expect(
55
clippy::module_name_repetitions,
66
clippy::similar_names,
77
clippy::cast_possible_truncation,
88
clippy::cast_possible_wrap
99
)]
10-
#![cfg_attr(test, allow(clippy::ignored_unit_patterns))]
1110

1211
#[cfg(feature = "alloc")]
1312
extern crate alloc;

rusl/src/network/bind.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub fn bind_inet(sock_fd: Fd, socket_address_inet: &SocketAddressInet) -> Result
3232
syscall!(
3333
BIND,
3434
sock_fd.0,
35-
socket_address_inet as *const SocketAddressInet,
35+
core::ptr::from_ref::<SocketAddressInet>(socket_address_inet),
3636
SocketAddressInet::LENGTH
3737
)
3838
};

rusl/src/network/connect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pub fn connect_inet(sock_fd: Fd, addr: &SocketAddressInet) -> Result<()> {
3333
syscall!(
3434
CONNECT,
3535
sock_fd.0,
36-
addr as *const SocketAddressInet,
36+
core::ptr::from_ref::<SocketAddressInet>(addr),
3737
SocketAddressInet::LENGTH
3838
)
3939
};

rusl/src/network/socket.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ pub fn recvmsg(sock_fd: Fd, recv: &mut crate::platform::MsgHdrBorrow, flags: i32
8080
syscall!(
8181
RECVMSG,
8282
sock_fd.0,
83-
recv as *mut crate::platform::MsgHdrBorrow,
83+
core::ptr::from_mut::<crate::platform::MsgHdrBorrow>(recv),
8484
flags
8585
)
8686
};

0 commit comments

Comments
 (0)