bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #114776 - fee1-dead-contrib:enable-effects-in-libcore, r=oli-obk

Browse source 
Enable effects for libcore

~~r? `@oli-obk~~`

forgot you are on vacation, oops
This commit is contained in:
bors 2023-09-22 07:00:52 +00:00
commit 8759de0a49
19 changed files with 174 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_passes/src/lang_items.rs
View file

@ -20,7 +20,8 @@ use rustc_hir::lang_items::{extract, GenericRequirement};
use rustc_hir::{LangItem, LanguageItems, Target};
use rustc_middle::ty::TyCtxt;
use rustc_session::cstore::ExternCrate;
use rustc_span::{symbol::kw::Empty, Span};
use rustc_span::symbol::kw::Empty;
use rustc_span::{sym, Span};
use rustc_middle::query::Providers;
@ -157,7 +158,14 @@ impl<'tcx> LanguageItemCollector<'tcx> {
self.tcx.hir().get_by_def_id(item_def_id)
{
let (actual_num, generics_span) = match kind.generics() {
Some(generics) => (generics.params.len(), generics.span),
Some(generics) => (
generics
.params
.iter()
.filter(|p| !self.tcx.has_attr(p.def_id, sym::rustc_host))
.count(),
generics.span,
),
None => (0, *item_span),
};