Commit 038c022

authored

Auto merge of #144841 - cjgillot:typeck-no-attrs, r=<try>

Access less HIR attributes from typeck

2 parents f34ba77 + bf644e9 commit 038c022Copy full SHA for 038c022

File tree

-9

lines changed

-9

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,12 @@ use rustc_data_structures::unord::UnordSet;`
`46`	`46`	`use rustc_errors::codes::*;`
`47`	`47`	`use rustc_errors::{Applicability, ErrorGuaranteed, pluralize, struct_span_code_err};`
`48`	`48`	`use rustc_hir as hir;`
`49`		`-use rustc_hir::attrs::AttributeKind;`
`50`	`49`	`use rustc_hir::def::{DefKind, Res};`
`51`		`-use rustc_hir::{HirId, HirIdMap, Node, find_attr};`
	`50`	`+use rustc_hir::{HirId, HirIdMap, Node};`
`52`	`51`	`use rustc_hir_analysis::check::{check_abi, check_custom_abi};`
`53`	`52`	`use rustc_hir_analysis::hir_ty_lowering::HirTyLowerer;`
`54`	`53`	`use rustc_infer::traits::{ObligationCauseCode, ObligationInspector, WellFormedLoc};`
	`54`	`+use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;`
`55`	`55`	`use rustc_middle::query::Providers;`
`56`	`56`	`use rustc_middle::ty::{self, Ty, TyCtxt, TypeVisitableExt};`
`57`	`57`	`use rustc_middle::{bug, span_bug};`
`@@ -174,7 +174,7 @@ fn typeck_with_inspect<'tcx>(`
`174`	`174`	`.map(\|(idx, ty)\| fcx.normalize(arg_span(idx), ty)),`
`175`	`175`	`);`
`176`	`176`
`177`		`- if find_attr!(tcx.get_all_attrs(def_id),AttributeKind::Naked(..)) {`
	`177`	`+ if tcx.codegen_fn_attrs(def_id).flags.contains(CodegenFnAttrFlags::NAKED) {`
`178`	`178`	`naked_functions::typeck_naked_fn(tcx, def_id, body);`
`179`	`179`	`}`
`180`	`180`

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -2373,17 +2373,14 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {`
`2373`	`2373`	`if !self.is_relevant_kind_for_mode(x.kind) {`
`2374`	`2374`	`return false;`
`2375`	`2375`	`}`
`2376`		`- if self.matches_by_doc_alias(x.def_id) {`
`2377`		`- return true;`
`2378`		`- }`
`2379`		`- match edit_distance_with_substrings(`
	`2376`	`+ if let Some(d) = edit_distance_with_substrings(`
`2380`	`2377`	`name.as_str(),`
`2381`	`2378`	`x.name().as_str(),`
`2382`	`2379`	`max_dist,`
`2383`	`2380`	`) {`
`2384`		`- Some(d) => d > 0,`
`2385`		`- None => false,`
	`2381`	`+ return d > 0;`
`2386`	`2382`	`}`
	`2383`	`+ self.matches_by_doc_alias(x.def_id)`
`2387`	`2384`	`})`
`2388`	`2385`	`.copied()`
`2389`	`2386`	`.collect()`

Comments

(0)