rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

PR feedback

Browse Source
This commit is contained in:
Ben Kimock
2024-05-21 20:12:07 -04:00
parent 95150d7246
commit c3a606237d
10 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_serialize/src/opaque.rs
View File

@@ -17,7 +17,7 @@ use crate::int_overflow::DebugStrictAdd;
pub type FileEncodeResult = Result<usize, (PathBuf, io::Error)>;
const FOOTER: &[u8] = b"rust-end-file";
pub const MAGIC_END_BYTES: &[u8] = b"rust-end-file";
/// The size of the buffer in `FileEncoder`.
const BUF_SIZE: usize = 8192;
@@ -183,7 +183,7 @@ impl FileEncoder {
}
pub fn finish(&mut self) -> FileEncodeResult {
self.write_all(FOOTER);
self.write_all(MAGIC_END_BYTES);
self.flush();
#[cfg(debug_assertions)]
{
@@ -264,10 +264,10 @@ pub struct MemDecoder<'a> {
impl<'a> MemDecoder<'a> {
#[inline]
pub fn new(data: &'a [u8], position: usize) -> Option<MemDecoder<'a>> {
let data = data.strip_suffix(FOOTER)?;
pub fn new(data: &'a [u8], position: usize) -> Result<MemDecoder<'a>, ()> {
let data = data.strip_suffix(MAGIC_END_BYTES).ok_or(())?;
let Range { start, end } = data.as_ptr_range();
Some(MemDecoder { start, current: data[position..].as_ptr(), end, _marker: PhantomData })
Ok(MemDecoder { start, current: data[position..].as_ptr(), end, _marker: PhantomData })
}
#[inline]

5
compiler/rustc_serialize/tests/leb128.rs
View File

@@ -1,5 +1,6 @@
use rustc_serialize::leb128::*;
use rustc_serialize::opaque::MemDecoder;
use rustc_serialize::opaque::MAGIC_END_BYTES;
use rustc_serialize::Decoder;
macro_rules! impl_test_unsigned_leb128 {
@@ -27,7 +28,7 @@ macro_rules! impl_test_unsigned_leb128 {
stream.extend(&buf[..n]);
}
let stream_end = stream.len();
stream.extend(b"rust-end-file");
stream.extend(MAGIC_END_BYTES);
let mut decoder = MemDecoder::new(&stream, 0).unwrap();
for &expected in &values {
@@ -76,7 +77,7 @@ macro_rules! impl_test_signed_leb128 {
stream.extend(&buf[..n]);
}
let stream_end = stream.len();
stream.extend(b"rust-end-file");
stream.extend(MAGIC_END_BYTES);
let mut decoder = MemDecoder::new(&stream, 0).unwrap();
for &expected in &values {