Skip to content

Commit 374c7ae

Browse files
committed
unsafe things.
1 parent c13b5ce commit 374c7ae

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
@@ -305,7 +305,7 @@ impl<R: Read> Read for BufReader<R> {
305305

306306
// we can't skip unconditionally because of the large buffer case in read.
307307
unsafe fn initializer(&self) -> Initializer {
308-
self.inner.initializer()
308+
unsafe { (*self).initializer() }
309309
}
310310
}
311311

library/alloc/src/io/cursor.rs

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

282282
#[inline]
283283
unsafe fn initializer(&self) -> Initializer {
284-
Initializer::nop()
284+
unsafe { Initializer::nop() }
285285
}
286286
}
287287

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]
@@ -256,7 +256,7 @@ impl Read for &[u8] {
256256

257257
#[inline]
258258
unsafe fn initializer(&self) -> Initializer {
259-
Initializer::nop()
259+
unsafe { Initializer::nop() }
260260
}
261261

262262
#[inline]

library/alloc/src/io/mod.rs

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

22172217
unsafe fn initializer(&self) -> Initializer {
2218-
let initializer = self.first.initializer();
2219-
if initializer.should_initialize() { initializer } else { self.second.initializer() }
2218+
unsafe {
2219+
let initializer = self.first.initializer();
2220+
if initializer.should_initialize() { initializer } else { self.second.initializer() }
2221+
}
22202222
}
22212223
}
22222224

@@ -2406,7 +2408,9 @@ impl<T: Read> Read for Take<T> {
24062408
}
24072409

24082410
unsafe fn initializer(&self) -> Initializer {
2409-
self.inner.initializer()
2411+
unsafe {
2412+
self.inner.initializer()
2413+
}
24102414
}
24112415

24122416
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
@@ -45,7 +45,7 @@ impl Read for Empty {
4545

4646
#[inline]
4747
unsafe fn initializer(&self) -> Initializer {
48-
Initializer::nop()
48+
unsafe { Initializer::nop() }
4949
}
5050
}
5151
#[stable(feature = "rust1", since = "1.0.0")]
@@ -135,7 +135,7 @@ impl Read for Repeat {
135135

136136
#[inline]
137137
unsafe fn initializer(&self) -> Initializer {
138-
Initializer::nop()
138+
unsafe { Initializer::nop() }
139139
}
140140
}
141141

0 commit comments

Comments
 (0)