Skip to content

Commit 5f26659

Browse files
Apply suggestions from code review
Co-authored-by: Waffle Maybe <[email protected]>
1 parent b94cfef commit 5f26659

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

compiler/rustc_codegen_ssa/src/back/metadata.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ pub(super) fn get_metadata_xcoff<'a>(path: &Path, data: &'a [u8]) -> Result<&'a
162162
return Err(format!("Invalid metadata symbol offset: {offset}"));
163163
}
164164
// The offset specifies the location of rustc metadata in the comment section.
165-
// The metadata is preceded by a 4-byte length field.
165+
// The metadata is preceded by a 8-byte length field.
166166
let len = u64::from_le_bytes(info_data[(offset - 8)..offset].try_into().unwrap()) as usize;
167167
if offset + len > (info_data.len() as usize) {
168168
return Err(format!(

compiler/rustc_metadata/src/rmeta/decoder.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -705,9 +705,8 @@ impl MetadataBlob {
705705
}
706706

707707
fn root_pos(&self) -> NonZeroUsize {
708-
let slice = &self.blob()[..];
709708
let offset = METADATA_HEADER.len();
710-
let pos_bytes = slice[offset..][..8].try_into().unwrap();
709+
let pos_bytes = self.blob()[offset..][..8].try_into().unwrap();
711710
let pos = u64::from_le_bytes(pos_bytes);
712711
NonZeroUsize::new(pos as usize).unwrap()
713712
}

src/tools/rust-analyzer/crates/proc-macro-api/src/version.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ pub fn read_version(dylib_path: &AbsPath) -> io::Result<String> {
153153
// 1 byte for length of version string
154154
// so 13 or 17 bytes in total, and we should check the last of those bytes
155155
// to know the length
156-
let mut bytes_before_version = vec![0u8; bytes_before_version];
157-
uncompressed.read_exact(&mut bytes_before_version)?;
156+
uncompressed.read_exact(&mut [0u8; 17][..bytes_before_version)?;
158157
let length = *bytes_before_version.last().unwrap();
159158

160159
let mut version_string_utf8 = vec![0u8; length as usize];

0 commit comments

Comments
 (0)