Skip to content

Commit 146b396

Browse files
committed
consolidate 2 unsafe blocks into 1
1 parent 98c6200 commit 146b396

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ impl<R> BufReader<R> {
170170
/// ```
171171
#[stable(feature = "bufreader_buffer", since = "1.37.0")]
172172
pub fn buffer(&self) -> &[u8] {
173+
// SAFETY: self.cap is always <= self.init, so self.buf[self.pos..self.cap] is always init
173174
unsafe { MaybeUninit::slice_assume_init_ref(&self.buf[self.pos..self.cap]) }
174175
}
175176

@@ -392,8 +393,7 @@ impl<R: Read> BufRead for BufReader<R> {
392393

393394
self.pos = 0;
394395
}
395-
// SAFETY: self.cap is always <= self.init, so self.buf[self.pos..self.cap] is always init
396-
unsafe { Ok(MaybeUninit::slice_assume_init_ref(&self.buf[self.pos..self.cap])) }
396+
Ok(self.buffer())
397397
}
398398

399399
fn consume(&mut self, amt: usize) {

0 commit comments

Comments
 (0)