resolve clippy errors
Signed-off-by: onur-ozkan <work@onurozkan.dev>
This commit is contained in:
parent
a61bf3093e
commit
81d7d7aabd
10 changed files with 24 additions and 26 deletions
|
@ -11,6 +11,7 @@ use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
|
||||||
use rustc_data_structures::sync::Lrc;
|
use rustc_data_structures::sync::Lrc;
|
||||||
use rustc_macros::HashStable_Generic;
|
use rustc_macros::HashStable_Generic;
|
||||||
use rustc_span::symbol::{kw, sym};
|
use rustc_span::symbol::{kw, sym};
|
||||||
|
#[allow(clippy::useless_attribute)] // FIXME: following use of `hidden_glob_reexports` incorrectly triggers `useless_attribute` lint.
|
||||||
#[allow(hidden_glob_reexports)]
|
#[allow(hidden_glob_reexports)]
|
||||||
use rustc_span::symbol::{Ident, Symbol};
|
use rustc_span::symbol::{Ident, Symbol};
|
||||||
use rustc_span::{edition::Edition, ErrorGuaranteed, Span, DUMMY_SP};
|
use rustc_span::{edition::Edition, ErrorGuaranteed, Span, DUMMY_SP};
|
||||||
|
|
|
@ -326,6 +326,7 @@ pub unsafe fn create_module<'ll>(
|
||||||
//
|
//
|
||||||
// On the wasm targets it will get hooked up to the "producer" sections
|
// On the wasm targets it will get hooked up to the "producer" sections
|
||||||
// `processed-by` information.
|
// `processed-by` information.
|
||||||
|
#[allow(clippy::option_env_unwrap)]
|
||||||
let rustc_producer =
|
let rustc_producer =
|
||||||
format!("rustc version {}", option_env!("CFG_VERSION").expect("CFG_VERSION"));
|
format!("rustc version {}", option_env!("CFG_VERSION").expect("CFG_VERSION"));
|
||||||
let name_metadata = llvm::LLVMMDStringInContext(
|
let name_metadata = llvm::LLVMMDStringInContext(
|
||||||
|
|
|
@ -291,7 +291,9 @@ pub fn intern_const_alloc_for_constprop<
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
// Move allocation to `tcx`.
|
// Move allocation to `tcx`.
|
||||||
for _ in intern_shallow(ecx, alloc_id, Mutability::Not).map_err(|()| err_ub!(DeadLocal))? {
|
if let Some(_) =
|
||||||
|
(intern_shallow(ecx, alloc_id, Mutability::Not).map_err(|()| err_ub!(DeadLocal))?).next()
|
||||||
|
{
|
||||||
// We are not doing recursive interning, so we don't currently support provenance.
|
// We are not doing recursive interning, so we don't currently support provenance.
|
||||||
// (If this assertion ever triggers, we should just implement a
|
// (If this assertion ever triggers, we should just implement a
|
||||||
// proper recursive interning loop -- or just call `intern_const_alloc_recursive`.
|
// proper recursive interning loop -- or just call `intern_const_alloc_recursive`.
|
||||||
|
|
|
@ -2201,7 +2201,7 @@ impl<D: Decoder> Decodable<D> for EncodedMetadata {
|
||||||
let mmap = if len > 0 {
|
let mmap = if len > 0 {
|
||||||
let mut mmap = MmapMut::map_anon(len).unwrap();
|
let mut mmap = MmapMut::map_anon(len).unwrap();
|
||||||
for _ in 0..len {
|
for _ in 0..len {
|
||||||
(&mut mmap[..]).write(&[d.read_u8()]).unwrap();
|
(&mut mmap[..]).write_all(&[d.read_u8()]).unwrap();
|
||||||
}
|
}
|
||||||
mmap.flush().unwrap();
|
mmap.flush().unwrap();
|
||||||
Some(mmap.make_read_only().unwrap())
|
Some(mmap.make_read_only().unwrap())
|
||||||
|
|
|
@ -114,21 +114,17 @@ impl<'hir> Iterator for ParentOwnerIterator<'hir> {
|
||||||
if self.current_id == CRATE_HIR_ID {
|
if self.current_id == CRATE_HIR_ID {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
loop {
|
|
||||||
// There are nodes that do not have entries, so we need to skip them.
|
|
||||||
let parent_id = self.map.def_key(self.current_id.owner.def_id).parent;
|
|
||||||
|
|
||||||
|
let parent_id = self.map.def_key(self.current_id.owner.def_id).parent;
|
||||||
let parent_id = parent_id.map_or(CRATE_OWNER_ID, |local_def_index| {
|
let parent_id = parent_id.map_or(CRATE_OWNER_ID, |local_def_index| {
|
||||||
let def_id = LocalDefId { local_def_index };
|
let def_id = LocalDefId { local_def_index };
|
||||||
self.map.tcx.local_def_id_to_hir_id(def_id).owner
|
self.map.tcx.local_def_id_to_hir_id(def_id).owner
|
||||||
});
|
});
|
||||||
self.current_id = HirId::make_owner(parent_id.def_id);
|
self.current_id = HirId::make_owner(parent_id.def_id);
|
||||||
|
|
||||||
// If this `HirId` doesn't have an entry, skip it and look for its `parent_id`.
|
|
||||||
let node = self.map.tcx.hir_owner_node(self.current_id.owner);
|
let node = self.map.tcx.hir_owner_node(self.current_id.owner);
|
||||||
return Some((self.current_id.owner, node));
|
return Some((self.current_id.owner, node));
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'tcx> TyCtxt<'tcx> {
|
impl<'tcx> TyCtxt<'tcx> {
|
||||||
|
|
|
@ -671,11 +671,11 @@ pub fn read_target_uint(endianness: Endian, mut source: &[u8]) -> Result<u128, i
|
||||||
// So we do not read exactly 16 bytes into the u128, just the "payload".
|
// So we do not read exactly 16 bytes into the u128, just the "payload".
|
||||||
let uint = match endianness {
|
let uint = match endianness {
|
||||||
Endian::Little => {
|
Endian::Little => {
|
||||||
source.read(&mut buf)?;
|
source.read_exact(&mut buf[..source.len()])?;
|
||||||
Ok(u128::from_le_bytes(buf))
|
Ok(u128::from_le_bytes(buf))
|
||||||
}
|
}
|
||||||
Endian::Big => {
|
Endian::Big => {
|
||||||
source.read(&mut buf[16 - source.len()..])?;
|
source.read_exact(&mut buf[16 - source.len()..])?;
|
||||||
Ok(u128::from_be_bytes(buf))
|
Ok(u128::from_be_bytes(buf))
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -229,7 +229,6 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
|
||||||
span: Span,
|
span: Span,
|
||||||
scrutinee_span: Span,
|
scrutinee_span: Span,
|
||||||
) -> BlockAnd<()> {
|
) -> BlockAnd<()> {
|
||||||
let scrutinee_span = scrutinee_span;
|
|
||||||
let scrutinee_place =
|
let scrutinee_place =
|
||||||
unpack!(block = self.lower_scrutinee(block, scrutinee_id, scrutinee_span));
|
unpack!(block = self.lower_scrutinee(block, scrutinee_id, scrutinee_span));
|
||||||
|
|
||||||
|
|
|
@ -57,11 +57,11 @@ pub(crate) fn read_target_uint(mut bytes: &[u8]) -> Result<u128, Error> {
|
||||||
let mut buf = [0u8; std::mem::size_of::<u128>()];
|
let mut buf = [0u8; std::mem::size_of::<u128>()];
|
||||||
match MachineInfo::target_endianess() {
|
match MachineInfo::target_endianess() {
|
||||||
Endian::Little => {
|
Endian::Little => {
|
||||||
bytes.read(&mut buf)?;
|
bytes.read_exact(&mut buf[..bytes.len()])?;
|
||||||
Ok(u128::from_le_bytes(buf))
|
Ok(u128::from_le_bytes(buf))
|
||||||
}
|
}
|
||||||
Endian::Big => {
|
Endian::Big => {
|
||||||
bytes.read(&mut buf[16 - bytes.len()..])?;
|
bytes.read_exact(&mut buf[16 - bytes.len()..])?;
|
||||||
Ok(u128::from_be_bytes(buf))
|
Ok(u128::from_be_bytes(buf))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -72,11 +72,11 @@ pub(crate) fn read_target_int(mut bytes: &[u8]) -> Result<i128, Error> {
|
||||||
let mut buf = [0u8; std::mem::size_of::<i128>()];
|
let mut buf = [0u8; std::mem::size_of::<i128>()];
|
||||||
match MachineInfo::target_endianess() {
|
match MachineInfo::target_endianess() {
|
||||||
Endian::Little => {
|
Endian::Little => {
|
||||||
bytes.read(&mut buf)?;
|
bytes.read_exact(&mut buf[..bytes.len()])?;
|
||||||
Ok(i128::from_le_bytes(buf))
|
Ok(i128::from_le_bytes(buf))
|
||||||
}
|
}
|
||||||
Endian::Big => {
|
Endian::Big => {
|
||||||
bytes.read(&mut buf[16 - bytes.len()..])?;
|
bytes.read_exact(&mut buf[16 - bytes.len()..])?;
|
||||||
Ok(i128::from_be_bytes(buf))
|
Ok(i128::from_be_bytes(buf))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -328,10 +328,9 @@ impl<R: ?Sized + Read> Read for BufReader<R> {
|
||||||
self.discard_buffer();
|
self.discard_buffer();
|
||||||
return self.inner.read_vectored(bufs);
|
return self.inner.read_vectored(bufs);
|
||||||
}
|
}
|
||||||
let nread = {
|
|
||||||
let mut rem = self.fill_buf()?;
|
let mut rem = self.fill_buf()?;
|
||||||
rem.read_vectored(bufs)?
|
let nread = rem.read_vectored(bufs)?;
|
||||||
};
|
|
||||||
self.consume(nread);
|
self.consume(nread);
|
||||||
Ok(nread)
|
Ok(nread)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
use super::{flags::Flags, ChangeIdWrapper, Config};
|
use super::{flags::Flags, ChangeIdWrapper, Config};
|
||||||
use crate::core::config::{LldMode, TomlConfig};
|
|
||||||
use crate::core::build_steps::check::get_clippy_rules_in_order;
|
use crate::core::build_steps::check::get_clippy_rules_in_order;
|
||||||
|
use crate::core::config::{LldMode, TomlConfig};
|
||||||
|
|
||||||
use clap::CommandFactory;
|
use clap::CommandFactory;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue