nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 16:54:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix clippy::{needless_bool, manual_unwrap_or}

Browse Source
This commit is contained in:
Matthias Krüger 2020-12-11 18:08:05 +01:00
parent db6c50998c
commit b7795e135a
5 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/rustc_mir/src/transform/early_otherwise_branch.rs
View File

@ -216,9 +216,10 @@ impl<'a, 'tcx> Helper<'a, 'tcx> {
let discr = self.find_switch_discriminant_info(bb, switch)?; let discr = self.find_switch_discriminant_info(bb, switch)?;
// go through each target, finding a discriminant read, and a switch // go through each target, finding a discriminant read, and a switch
let results = discr.targets_with_values.iter().map(|(value, target)| { let results = discr
self.find_discriminant_switch_pairing(&discr, *target, *value) .targets_with_values
}); .iter()
.map(|(value, target)| self.find_discriminant_switch_pairing(&discr, *target, *value));
// if the optimization did not apply for one of the targets, then abort // if the optimization did not apply for one of the targets, then abort
if results.clone().any(|x| x.is_none()) || results.len() == 0 { if results.clone().any(|x| x.is_none()) || results.len() == 0 {

5
compiler/rustc_session/src/session.rs
View File

@ -1109,10 +1109,7 @@ impl Session {
} }
pub fn link_dead_code(&self) -> bool { pub fn link_dead_code(&self) -> bool {
match self.opts.cg.link_dead_code { self.opts.cg.link_dead_code.unwrap_or(false)
Some(explicitly_set) => explicitly_set,
None => false,
}
} }
pub fn mark_attr_known(&self, attr: &Attribute) { pub fn mark_attr_known(&self, attr: &Attribute) {

21
compiler/rustc_typeck/src/check/upvar.rs
View File

@ -297,17 +297,16 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
closure_captures.insert(*var_hir_id, upvar_id); closure_captures.insert(*var_hir_id, upvar_id);
let new_capture_kind = if let Some(capture_kind) = let new_capture_kind =
upvar_capture_map.get(&upvar_id) if let Some(capture_kind) = upvar_capture_map.get(&upvar_id) {
{ // upvar_capture_map only stores the UpvarCapture (CaptureKind),
// upvar_capture_map only stores the UpvarCapture (CaptureKind), // so we create a fake capture info with no expression.
// so we create a fake capture info with no expression. let fake_capture_info =
let fake_capture_info = ty::CaptureInfo { expr_id: None, capture_kind: *capture_kind };
ty::CaptureInfo { expr_id: None, capture_kind: *capture_kind }; determine_capture_info(fake_capture_info, capture_info).capture_kind
determine_capture_info(fake_capture_info, capture_info).capture_kind } else {
} else { capture_info.capture_kind
capture_info.capture_kind };
};
upvar_capture_map.insert(upvar_id, new_capture_kind); upvar_capture_map.insert(upvar_id, new_capture_kind);
} }
} }

7
compiler/rustc_typeck/src/collect.rs
View File

@ -2141,13 +2141,8 @@ fn explicit_predicates_of(tcx: TyCtxt<'_>, def_id: DefId) -> ty::GenericPredicat
// * It must be an associated type for this trait (*not* a // * It must be an associated type for this trait (*not* a
// supertrait). // supertrait).
if let ty::Projection(projection) = ty.kind() { if let ty::Projection(projection) = ty.kind() {
if projection.substs == trait_identity_substs projection.substs == trait_identity_substs
&& tcx.associated_item(projection.item_def_id).container.id() == def_id && tcx.associated_item(projection.item_def_id).container.id() == def_id
{
true
} else {
false
}
} else { } else {
false false
} }

6
src/bootstrap/sanity.rs
View File

@ -159,11 +159,7 @@ pub fn check(build: &mut Build) {
panic!("the iOS target is only supported on macOS"); panic!("the iOS target is only supported on macOS");
} }
build build.config.target_config.entry(*target).or_insert(Target::from_triple(&target.triple));
.config
.target_config
.entry(*target)
.or_insert(Target::from_triple(&target.triple));
if target.contains("-none-") || target.contains("nvptx") { if target.contains("-none-") || target.contains("nvptx") {
if build.no_std(*target) == Some(false) { if build.no_std(*target) == Some(false) {