Skip to content

Commit 6ce2273

committed

Auto merge of #110882 - BoxyUwU:rename-some-ty-flags, r=compiler-errors

rename `NEEDS_SUBST` and `NEEDS_INFER` implements rust-lang/compiler-team#617

2 parents 8b8110e + 8424197 commit 6ce2273Copy full SHA for 6ce2273

File tree

46 files changed

+86

-85

lines changed

compiler
- rustc_codegen_cranelift/src
  - abi
    - mod.rs
  - base.rs
- rustc_codegen_gcc/src
  - callee.rs
  - mono_item.rs
- rustc_codegen_llvm/src
  - callee.rs
  - debuginfo
    - mod.rs
  - mono_item.rs
- rustc_codegen_ssa/src/mir
  - mod.rs
- rustc_const_eval/src/interpret
  - util.rs
- rustc_hir_analysis/src
  - astconv
    - mod.rs
  - check
    - wfcheck.rs
  - coherence
    - orphan.rs
  - impl_wf_check
    - min_specialization.rs
- rustc_hir_typeck/src
  - fn_ctxt
    - mod.rs
    - suggestions.rs
  - generator_interior
    - drop_ranges
      - record_consumed_borrow.rs
    - mod.rs
  - method
    - probe.rs
  - writeback.rs
- rustc_infer/src/infer
  - canonical
    - canonicalizer.rs
  - freshen.rs
  - mod.rs
  - outlives
    - obligations.rs
  - resolve.rs
- rustc_lint/src
  - enum_intrinsics_non_enums.rs
- rustc_middle/src/ty
- rustc_mir_transform/src
  - const_prop.rs
  - const_prop_lint.rs
  - inline
    - cycle.rs
- rustc_monomorphize/src/partitioning
  - default.rs
- rustc_symbol_mangling/src
  - legacy.rs
- rustc_trait_selection/src
  - infer.rs
  - solve
    - canonicalize.rs
  - traits
    - coherence.rs
    - mod.rs
    - outlives_bounds.rs
    - select
      - mod.rs
    - vtable.rs
- rustc_traits/src
  - normalize_erasing_regions.rs
- rustc_ty_utils/src
  - instance.rs
- rustc_type_ir/src
  - lib.rs
src/tools/clippy/clippy_utils/src
- ty.rs

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+86

-85

lines changed

`‎compiler/rustc_codegen_cranelift/src/abi/mod.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ pub(crate) fn get_function_sig<'tcx>(`
`70`	`70`	`default_call_conv: CallConv,`
`71`	`71`	`inst: Instance<'tcx>,`
`72`	`72`	`) -> Signature {`
`73`		`- assert!(!inst.substs.needs_infer());`
	`73`	`+ assert!(!inst.substs.has_infer());`
`74`	`74`	`clif_sig_from_fn_abi(`
`75`	`75`	`tcx,`
`76`	`76`	`default_call_conv,`

`‎compiler/rustc_codegen_cranelift/src/base.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ pub(crate) fn codegen_fn<'tcx>(`
`28`	`28`	`module: &mut dyn Module,`
`29`	`29`	`instance: Instance<'tcx>,`
`30`	`30`	`) -> CodegenedFunction {`
`31`		`- debug_assert!(!instance.substs.needs_infer());`
	`31`	`+ debug_assert!(!instance.substs.has_infer());`
`32`	`32`
`33`	`33`	`let symbol_name = tcx.symbol_name(instance).name.to_string();`
`34`	`34`	`let _timer = tcx.prof.generic_activity_with_arg("codegen fn", &*symbol_name);`

`‎compiler/rustc_codegen_gcc/src/callee.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ use crate::context::CodegenCx;`
`17`	`17`	`pub fn get_fn<'gcc, 'tcx>(cx: &CodegenCx<'gcc, 'tcx>, instance: Instance<'tcx>) -> Function<'gcc> {`
`18`	`18`	`let tcx = cx.tcx();`
`19`	`19`
`20`		`- assert!(!instance.substs.needs_infer());`
	`20`	`+ assert!(!instance.substs.has_infer());`
`21`	`21`	`assert!(!instance.substs.has_escaping_bound_vars());`
`22`	`22`
`23`	`23`	`let sym = tcx.symbol_name(instance).name;`

`‎compiler/rustc_codegen_gcc/src/mono_item.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ impl<'gcc, 'tcx> PreDefineMethods<'tcx> for CodegenCx<'gcc, 'tcx> {`
`31`	`31`
`32`	`32`	`#[cfg_attr(not(feature="master"), allow(unused_variables))]`
`33`	`33`	`fn predefine_fn(&self, instance: Instance<'tcx>, linkage: Linkage, visibility: Visibility, symbol_name: &str) {`
`34`		`- assert!(!instance.substs.needs_infer());`
	`34`	`+ assert!(!instance.substs.has_infer());`
`35`	`35`
`36`	`36`	`let fn_abi = self.fn_abi_of_instance(instance, ty::List::empty());`
`37`	`37`	`self.linkage.set(base::linkage_to_gcc(linkage));`

`‎compiler/rustc_codegen_llvm/src/callee.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ pub fn get_fn<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>, instance: Instance<'tcx>) ->`
`27`	`27`
`28`	`28`	`debug!("get_fn(instance={:?})", instance);`
`29`	`29`
`30`		`- assert!(!instance.substs.needs_infer());`
	`30`	`+ assert!(!instance.substs.has_infer());`
`31`	`31`	`assert!(!instance.substs.has_escaping_bound_vars());`
`32`	`32`
`33`	`33`	`if let Some(&llfn) = cx.instances.borrow().get(&instance) {`

`‎compiler/rustc_codegen_llvm/src/debuginfo/mod.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ impl<'ll, 'tcx> DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> {`
`515`	`515`	`ty::Adt(def, ..) if !def.is_box() => {`
`516`	`516`	`// Again, only create type information if full debuginfo is enabled`
`517`	`517`	`if cx.sess().opts.debuginfo == DebugInfo::Full`
`518`		`- && !impl_self_ty.needs_subst()`
	`518`	`+ && !impl_self_ty.has_param()`
`519`	`519`	`{`
`520`	`520`	`Some(type_di_node(cx, impl_self_ty))`
`521`	`521`	`} else {`

`‎compiler/rustc_codegen_llvm/src/mono_item.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ impl<'tcx> PreDefineMethods<'tcx> for CodegenCx<'_, 'tcx> {`
`48`	`48`	`visibility: Visibility,`
`49`	`49`	`symbol_name: &str,`
`50`	`50`	`) {`
`51`		`- assert!(!instance.substs.needs_infer());`
	`51`	`+ assert!(!instance.substs.has_infer());`
`52`	`52`
`53`	`53`	`let fn_abi = self.fn_abi_of_instance(instance, ty::List::empty());`
`54`	`54`	`let lldecl = self.declare_fn(symbol_name, fn_abi);`

`‎compiler/rustc_codegen_ssa/src/mir/mod.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ pub fn codegen_mir<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(`
`152`	`152`	`cx: &'a Bx::CodegenCx,`
`153`	`153`	`instance: Instance<'tcx>,`
`154`	`154`	`) {`
`155`		`- assert!(!instance.substs.needs_infer());`
	`155`	`+ assert!(!instance.substs.has_infer());`
`156`	`156`
`157`	`157`	`let llfn = cx.get_fn(instance);`
`158`	`158`

`‎compiler/rustc_const_eval/src/interpret/util.rs‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ where`
`14`	`14`	`T: TypeVisitable<TyCtxt<'tcx>>,`
`15`	`15`	`{`
`16`	`16`	`debug!("ensure_monomorphic_enough: ty={:?}", ty);`
`17`		`- if !ty.needs_subst() {`
	`17`	`+ if !ty.has_param() {`
`18`	`18`	`return Ok(());`
`19`	`19`	`}`
`20`	`20`
`@@ -27,7 +27,7 @@ where`
`27`	`27`	`type BreakTy = FoundParam;`
`28`	`28`
`29`	`29`	`fn visit_ty(&mut self, ty: Ty<'tcx>) -> ControlFlow<Self::BreakTy> {`
`30`		`- if !ty.needs_subst() {`
	`30`	`+ if !ty.has_param() {`
`31`	`31`	`return ControlFlow::Continue(());`
`32`	`32`	`}`
`33`	`33`
`@@ -46,7 +46,7 @@ where`
`46`	`46`	`// are used and require substitution.`
`47`	`47`	`// Just in case there are closures or generators within this subst,`
`48`	`48`	`// recurse.`
`49`		`- if unused_params.is_used(index) && subst.needs_subst() {`
	`49`	`+ if unused_params.is_used(index) && subst.has_param() {`
`50`	`50`	`return subst.visit_with(self);`
`51`	`51`	`}`
`52`	`52`	`}`

`‎compiler/rustc_hir_analysis/src/astconv/mod.rs‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2318,7 +2318,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {`
`2318`	`2318`	`let infcx = match self.infcx() {`
`2319`	`2319`	`Some(infcx) => infcx,`
`2320`	`2320`	`None => {`
`2321`		`- assert!(!self_ty.needs_infer());`
	`2321`	`+ assert!(!self_ty.has_infer());`
`2322`	`2322`	`infcx_ = tcx.infer_ctxt().ignoring_regions().build();`
`2323`	`2323`	`&infcx_`
`2324`	`2324`	`}`
`@@ -2489,7 +2489,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {`
`2489`	`2489`	`let infcx = if let Some(infcx) = self.infcx() {`
`2490`	`2490`	`infcx`
`2491`	`2491`	`} else {`
`2492`		`- assert!(!qself_ty.needs_infer());`
	`2492`	`+ assert!(!qself_ty.has_infer());`
`2493`	`2493`	`infcx_ = tcx.infer_ctxt().build();`
`2494`	`2494`	`&infcx_`
`2495`	`2495`	`};`
`@@ -3039,7 +3039,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {`
`3039`	`3039`	`// the anon const, which is empty. This is why the`
`3040`	`3040`	// `AlwaysApplicable` impl needs a `T: ?Sized` bound for
`3041`	`3041`	`// this to compile if we were to normalize here.`
`3042`		`- if forbid_generic && ty.needs_subst() {`
	`3042`	`+ if forbid_generic && ty.has_param() {`
`3043`	`3043`	`let mut err = tcx.sess.struct_span_err(`
`3044`	`3044`	`path.span,`
`3045`	`3045`	"generic `Self` types are currently not permitted in anonymous constants",

0 commit comments

Comments

(0)