Skip to content

Commit f6188ec

Browse files
committed
resolve clippy errors
Signed-off-by: onur-ozkan <[email protected]>
1 parent b9e3b07 commit f6188ec

File tree

9 files changed

+23
-25
lines changed

9 files changed

+23
-25
lines changed

compiler/rustc_ast/src/token.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
1111
use rustc_data_structures::sync::Lrc;
1212
use rustc_macros::HashStable_Generic;
1313
use rustc_span::symbol::{kw, sym};
14+
#[allow(clippy::useless_attribute)] // FIXME: following use of `hidden_glob_reexports` incorrectly triggers `useless_attribute` lint.
1415
#[allow(hidden_glob_reexports)]
1516
use rustc_span::symbol::{Ident, Symbol};
1617
use rustc_span::{edition::Edition, ErrorGuaranteed, Span, DUMMY_SP};

compiler/rustc_codegen_llvm/src/context.rs

+1
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ pub unsafe fn create_module<'ll>(
326326
//
327327
// On the wasm targets it will get hooked up to the "producer" sections
328328
// `processed-by` information.
329+
#[allow(clippy::option_env_unwrap)]
329330
let rustc_producer =
330331
format!("rustc version {}", option_env!("CFG_VERSION").expect("CFG_VERSION"));
331332
let name_metadata = llvm::LLVMMDStringInContext(

compiler/rustc_const_eval/src/interpret/intern.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,9 @@ pub fn intern_const_alloc_for_constprop<
291291
return Ok(());
292292
}
293293
// Move allocation to `tcx`.
294-
for _ in intern_shallow(ecx, alloc_id, Mutability::Not).map_err(|()| err_ub!(DeadLocal))? {
294+
if let Some(_) =
295+
(intern_shallow(ecx, alloc_id, Mutability::Not).map_err(|()| err_ub!(DeadLocal))?).next()
296+
{
295297
// We are not doing recursive interning, so we don't currently support provenance.
296298
// (If this assertion ever triggers, we should just implement a
297299
// proper recursive interning loop -- or just call `intern_const_alloc_recursive`.

compiler/rustc_metadata/src/rmeta/encoder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2201,7 +2201,7 @@ impl<D: Decoder> Decodable<D> for EncodedMetadata {
22012201
let mmap = if len > 0 {
22022202
let mut mmap = MmapMut::map_anon(len).unwrap();
22032203
for _ in 0..len {
2204-
(&mut mmap[..]).write(&[d.read_u8()]).unwrap();
2204+
(&mut mmap[..]).write_all(&[d.read_u8()]).unwrap();
22052205
}
22062206
mmap.flush().unwrap();
22072207
Some(mmap.make_read_only().unwrap())

compiler/rustc_middle/src/hir/map/mod.rs

+8-12
Original file line numberDiff line numberDiff line change
@@ -114,20 +114,16 @@ impl<'hir> Iterator for ParentOwnerIterator<'hir> {
114114
if self.current_id == CRATE_HIR_ID {
115115
return None;
116116
}
117-
loop {
118-
// There are nodes that do not have entries, so we need to skip them.
119-
let parent_id = self.map.def_key(self.current_id.owner.def_id).parent;
120117

121-
let parent_id = parent_id.map_or(CRATE_OWNER_ID, |local_def_index| {
122-
let def_id = LocalDefId { local_def_index };
123-
self.map.tcx.local_def_id_to_hir_id(def_id).owner
124-
});
125-
self.current_id = HirId::make_owner(parent_id.def_id);
118+
let parent_id = self.map.def_key(self.current_id.owner.def_id).parent;
119+
let parent_id = parent_id.map_or(CRATE_OWNER_ID, |local_def_index| {
120+
let def_id = LocalDefId { local_def_index };
121+
self.map.tcx.local_def_id_to_hir_id(def_id).owner
122+
});
123+
self.current_id = HirId::make_owner(parent_id.def_id);
126124

127-
// If this `HirId` doesn't have an entry, skip it and look for its `parent_id`.
128-
let node = self.map.tcx.hir_owner_node(self.current_id.owner);
129-
return Some((self.current_id.owner, node));
130-
}
125+
let node = self.map.tcx.hir_owner_node(self.current_id.owner);
126+
return Some((self.current_id.owner, node));
131127
}
132128
}
133129

compiler/rustc_middle/src/mir/interpret/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -671,11 +671,11 @@ pub fn read_target_uint(endianness: Endian, mut source: &[u8]) -> Result<u128, i
671671
// So we do not read exactly 16 bytes into the u128, just the "payload".
672672
let uint = match endianness {
673673
Endian::Little => {
674-
source.read(&mut buf)?;
674+
let _ = source.read(&mut buf)?;
675675
Ok(u128::from_le_bytes(buf))
676676
}
677677
Endian::Big => {
678-
source.read(&mut buf[16 - source.len()..])?;
678+
source.read_exact(&mut buf[16 - source.len()..])?;
679679
Ok(u128::from_be_bytes(buf))
680680
}
681681
};

compiler/rustc_mir_build/src/build/matches/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
229229
span: Span,
230230
scrutinee_span: Span,
231231
) -> BlockAnd<()> {
232-
let scrutinee_span = scrutinee_span;
233232
let scrutinee_place =
234233
unpack!(block = self.lower_scrutinee(block, scrutinee_id, scrutinee_span));
235234

compiler/stable_mir/src/mir/alloc.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ pub(crate) fn read_target_uint(mut bytes: &[u8]) -> Result<u128, Error> {
5757
let mut buf = [0u8; std::mem::size_of::<u128>()];
5858
match MachineInfo::target_endianess() {
5959
Endian::Little => {
60-
bytes.read(&mut buf)?;
60+
let _ = bytes.read(&mut buf)?;
6161
Ok(u128::from_le_bytes(buf))
6262
}
6363
Endian::Big => {
64-
bytes.read(&mut buf[16 - bytes.len()..])?;
64+
bytes.read_exact(&mut buf[16 - bytes.len()..])?;
6565
Ok(u128::from_be_bytes(buf))
6666
}
6767
}
@@ -72,11 +72,11 @@ pub(crate) fn read_target_int(mut bytes: &[u8]) -> Result<i128, Error> {
7272
let mut buf = [0u8; std::mem::size_of::<i128>()];
7373
match MachineInfo::target_endianess() {
7474
Endian::Little => {
75-
bytes.read(&mut buf)?;
75+
let _ = bytes.read(&mut buf)?;
7676
Ok(i128::from_le_bytes(buf))
7777
}
7878
Endian::Big => {
79-
bytes.read(&mut buf[16 - bytes.len()..])?;
79+
bytes.read_exact(&mut buf[16 - bytes.len()..])?;
8080
Ok(i128::from_be_bytes(buf))
8181
}
8282
}

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,9 @@ impl<R: ?Sized + Read> Read for BufReader<R> {
328328
self.discard_buffer();
329329
return self.inner.read_vectored(bufs);
330330
}
331-
let nread = {
332-
let mut rem = self.fill_buf()?;
333-
rem.read_vectored(bufs)?
334-
};
331+
let mut rem = self.fill_buf()?;
332+
let nread = rem.read_vectored(bufs)?;
333+
335334
self.consume(nread);
336335
Ok(nread)
337336
}

0 commit comments

Comments
 (0)