Skip to content

Commit 59112d3

Browse files
authored
Rollup merge of rust-lang#73962 - ryr3:unsafe_tcp, r=LukasKalbertodt
libstd/net/tcp.rs: #![deny(unsafe_op_in_unsafe_fn)] Enclose unsafe operations in unsafe blocks for net/tcp.rs. Fixes part of rust-lang#73904.
2 parents 4d24341 + 8dc1e42 commit 59112d3

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/libstd/net/tcp.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#![deny(unsafe_op_in_unsafe_fn)]
12
use crate::io::prelude::*;
23

34
use crate::fmt;
@@ -583,7 +584,8 @@ impl Read for TcpStream {
583584

584585
#[inline]
585586
unsafe fn initializer(&self) -> Initializer {
586-
Initializer::nop()
587+
// SAFETY: Read is guaranteed to work on uninitialized memory
588+
unsafe { Initializer::nop() }
587589
}
588590
}
589591
#[stable(feature = "rust1", since = "1.0.0")]
@@ -622,7 +624,8 @@ impl Read for &TcpStream {
622624

623625
#[inline]
624626
unsafe fn initializer(&self) -> Initializer {
625-
Initializer::nop()
627+
// SAFETY: Read is guaranteed to work on uninitialized memory
628+
unsafe { Initializer::nop() }
626629
}
627630
}
628631
#[stable(feature = "rust1", since = "1.0.0")]

0 commit comments

Comments
 (0)