Skip to content

Commit 737045a

Browse files
committed
unsafe things.
1 parent f16b3e4 commit 737045a

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

library/alloc/src/io/buffered/bufreader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ impl<R: Read> Read for BufReader<R> {
290290

291291
// we can't skip unconditionally because of the large buffer case in read.
292292
unsafe fn initializer(&self) -> Initializer {
293-
self.inner.initializer()
293+
unsafe { (*self).initializer() }
294294
}
295295
}
296296

library/alloc/src/io/cursor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ where
278278

279279
#[inline]
280280
unsafe fn initializer(&self) -> Initializer {
281-
Initializer::nop()
281+
unsafe { Initializer::nop() }
282282
}
283283
}
284284

library/alloc/src/io/impls.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ impl<R: Read + ?Sized> Read for &mut R {
3030

3131
#[inline]
3232
unsafe fn initializer(&self) -> Initializer {
33-
(**self).initializer()
33+
unsafe { (**self).initializer() }
3434
}
3535

3636
#[inline]
@@ -129,7 +129,7 @@ impl<R: Read + ?Sized> Read for Box<R> {
129129

130130
#[inline]
131131
unsafe fn initializer(&self) -> Initializer {
132-
(**self).initializer()
132+
unsafe { (**self).initializer() }
133133
}
134134

135135
#[inline]
@@ -270,7 +270,7 @@ impl Read for &[u8] {
270270

271271
#[inline]
272272
unsafe fn initializer(&self) -> Initializer {
273-
Initializer::nop()
273+
unsafe { Initializer::nop() }
274274
}
275275

276276
#[inline]

library/alloc/src/io/mod.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2165,8 +2165,10 @@ impl<T: Read, U: Read> Read for Chain<T, U> {
21652165
}
21662166

21672167
unsafe fn initializer(&self) -> Initializer {
2168-
let initializer = self.first.initializer();
2169-
if initializer.should_initialize() { initializer } else { self.second.initializer() }
2168+
unsafe {
2169+
let initializer = self.first.initializer();
2170+
if initializer.should_initialize() { initializer } else { self.second.initializer() }
2171+
}
21702172
}
21712173
}
21722174

@@ -2356,7 +2358,9 @@ impl<T: Read> Read for Take<T> {
23562358
}
23572359

23582360
unsafe fn initializer(&self) -> Initializer {
2359-
self.inner.initializer()
2361+
unsafe {
2362+
self.inner.initializer()
2363+
}
23602364
}
23612365

23622366
fn read_to_end(&mut self, buf: &mut Vec<u8>) -> Result<usize> {

library/alloc/src/io/util.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ impl Read for Empty {
115115

116116
#[inline]
117117
unsafe fn initializer(&self) -> Initializer {
118-
Initializer::nop()
118+
unsafe { Initializer::nop() }
119119
}
120120
}
121121
#[stable(feature = "rust1", since = "1.0.0")]
@@ -189,7 +189,7 @@ impl Read for Repeat {
189189

190190
#[inline]
191191
unsafe fn initializer(&self) -> Initializer {
192-
Initializer::nop()
192+
unsafe { Initializer::nop() }
193193
}
194194
}
195195

0 commit comments

Comments
 (0)