use slice::contains
where applicable
This commit is contained in:
parent
e77a8f439c
commit
9ef35ddc0c
7 changed files with 16 additions and 15 deletions
|
@ -74,12 +74,12 @@ pub(crate) fn use_panic_2021(mut span: Span) -> bool {
|
||||||
// (To avoid using the edition of e.g. the assert!() or debug_assert!() definition.)
|
// (To avoid using the edition of e.g. the assert!() or debug_assert!() definition.)
|
||||||
loop {
|
loop {
|
||||||
let expn = span.ctxt().outer_expn_data();
|
let expn = span.ctxt().outer_expn_data();
|
||||||
if let Some(features) = expn.allow_internal_unstable {
|
if let Some(features) = expn.allow_internal_unstable
|
||||||
if features.iter().any(|&f| f == sym::edition_panic) {
|
&& features.contains(&sym::edition_panic)
|
||||||
|
{
|
||||||
span = expn.call_site;
|
span = expn.call_site;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
break expn.edition >= Edition::Edition2021;
|
break expn.edition >= Edition::Edition2021;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2186,7 +2186,7 @@ fn msvc_imps_needed(tcx: TyCtxt<'_>) -> bool {
|
||||||
// indirectly from ThinLTO. In theory these are not needed as ThinLTO could resolve
|
// indirectly from ThinLTO. In theory these are not needed as ThinLTO could resolve
|
||||||
// these, but it currently does not do so.
|
// these, but it currently does not do so.
|
||||||
let can_have_static_objects =
|
let can_have_static_objects =
|
||||||
tcx.sess.lto() == Lto::Thin || tcx.crate_types().iter().any(|ct| *ct == CrateType::Rlib);
|
tcx.sess.lto() == Lto::Thin || tcx.crate_types().contains(&CrateType::Rlib);
|
||||||
|
|
||||||
tcx.sess.target.is_like_windows &&
|
tcx.sess.target.is_like_windows &&
|
||||||
can_have_static_objects &&
|
can_have_static_objects &&
|
||||||
|
|
|
@ -604,7 +604,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
|
||||||
if let Some((name, _)) = lang_items::extract(attrs)
|
if let Some((name, _)) = lang_items::extract(attrs)
|
||||||
&& let Some(lang_item) = LangItem::from_name(name)
|
&& let Some(lang_item) = LangItem::from_name(name)
|
||||||
{
|
{
|
||||||
if WEAK_LANG_ITEMS.iter().any(|&l| l == lang_item) {
|
if WEAK_LANG_ITEMS.contains(&lang_item) {
|
||||||
codegen_fn_attrs.flags |= CodegenFnAttrFlags::RUSTC_STD_INTERNAL_SYMBOL;
|
codegen_fn_attrs.flags |= CodegenFnAttrFlags::RUSTC_STD_INTERNAL_SYMBOL;
|
||||||
}
|
}
|
||||||
if let Some(link_name) = lang_item.link_name() {
|
if let Some(link_name) = lang_item.link_name() {
|
||||||
|
|
|
@ -1496,7 +1496,7 @@ fn build_scope_drops<'tcx>(
|
||||||
// path, then don't generate the drop. (We only take this into
|
// path, then don't generate the drop. (We only take this into
|
||||||
// account for non-unwind paths so as not to disturb the
|
// account for non-unwind paths so as not to disturb the
|
||||||
// caching mechanism.)
|
// caching mechanism.)
|
||||||
if scope.moved_locals.iter().any(|&o| o == local) {
|
if scope.moved_locals.contains(&local) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ struct EntryContext<'tcx> {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn entry_fn(tcx: TyCtxt<'_>, (): ()) -> Option<(DefId, EntryFnType)> {
|
fn entry_fn(tcx: TyCtxt<'_>, (): ()) -> Option<(DefId, EntryFnType)> {
|
||||||
let any_exe = tcx.crate_types().iter().any(|ty| *ty == CrateType::Executable);
|
let any_exe = tcx.crate_types().contains(&CrateType::Executable);
|
||||||
if !any_exe {
|
if !any_exe {
|
||||||
// No need to find a main function.
|
// No need to find a main function.
|
||||||
return None;
|
return None;
|
||||||
|
|
|
@ -149,14 +149,15 @@ pub fn extra_compiler_flags() -> Option<(Vec<String>, bool)> {
|
||||||
arg[a.len()..].to_string()
|
arg[a.len()..].to_string()
|
||||||
};
|
};
|
||||||
let option = content.split_once('=').map(|s| s.0).unwrap_or(&content);
|
let option = content.split_once('=').map(|s| s.0).unwrap_or(&content);
|
||||||
if ICE_REPORT_COMPILER_FLAGS_EXCLUDE.iter().any(|exc| option == *exc) {
|
if ICE_REPORT_COMPILER_FLAGS_EXCLUDE.contains(&option) {
|
||||||
excluded_cargo_defaults = true;
|
excluded_cargo_defaults = true;
|
||||||
} else {
|
} else {
|
||||||
result.push(a.to_string());
|
result.push(a.to_string());
|
||||||
match ICE_REPORT_COMPILER_FLAGS_STRIP_VALUE.iter().find(|s| option == **s) {
|
result.push(if ICE_REPORT_COMPILER_FLAGS_STRIP_VALUE.contains(&option) {
|
||||||
Some(s) => result.push(format!("{s}=[REDACTED]")),
|
format!("{option}=[REDACTED]")
|
||||||
None => result.push(content),
|
} else {
|
||||||
}
|
content
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -876,7 +876,7 @@ impl Span {
|
||||||
self.ctxt()
|
self.ctxt()
|
||||||
.outer_expn_data()
|
.outer_expn_data()
|
||||||
.allow_internal_unstable
|
.allow_internal_unstable
|
||||||
.is_some_and(|features| features.iter().any(|&f| f == feature))
|
.is_some_and(|features| features.contains(&feature))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Checks if this span arises from a compiler desugaring of kind `kind`.
|
/// Checks if this span arises from a compiler desugaring of kind `kind`.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue