diff options
| author | bors <bors@rust-lang.org> | 2023-07-14 15:31:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-14 15:31:15 +0000 |
| commit | 5767cad9b8b58a5c0521c5ddd652a24d0c65f466 (patch) | |
| tree | f8ea4e88a2ea59c4cf5e1e301490cb5dd8e454a8 /compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs | |
| parent | bacf5bcbc7dae526872cf6af3fc0064a51b1efa2 (diff) | |
| parent | e55583c4b831c601452117a8eb20af59779ef582 (diff) | |
| download | rust-5767cad9b8b58a5c0521c5ddd652a24d0c65f466.tar.gz rust-5767cad9b8b58a5c0521c5ddd652a24d0c65f466.zip | |
Auto merge of #113591 - mdibaiee:genericargs-cleanup, r=oli-obk
refactor(rustc_middle): Substs -> GenericArg resolves #110793 - [x] rename `SubstsRef` and `InternalSubsts` to `GenericArgsRef<'tcx>` and `GenericArgs<'tcx>`. - [x] rename variables and fields currently using `substs` to `args`. - [x] update the module name of `ty::subst` to `ty::generic_args` or sth. Make that module private and publicly reexport its content in the ty module. - [x] rename `EarlyBinder::subst(_identity)` to `EarlyBinder::instantiate(_identity)`. - [x] types called `[a-zA-Z]+Substs` renamed to `XArgs`. - [x] functions containing `substs` now use `args` or `generic_args` (mostly the former). However, the verb of "substituting" is still being used here and there, mostly in comments. I think that can be a separate PR as part of https://github.com/rust-lang/rust/issues/110254 to change the verb to `replace_generics` or something similar.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs b/compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs index 42fdbd78618..56a5c9e9061 100644 --- a/compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs +++ b/compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs @@ -22,7 +22,7 @@ use rustc_middle::mir::coverage::{ use rustc_middle::mir::Coverage; use rustc_middle::ty; use rustc_middle::ty::layout::{FnAbiOf, HasTyCtxt}; -use rustc_middle::ty::subst::InternalSubsts; +use rustc_middle::ty::GenericArgs; use rustc_middle::ty::Instance; use rustc_middle::ty::Ty; @@ -250,7 +250,7 @@ fn declare_unused_fn<'tcx>(cx: &CodegenCx<'_, 'tcx>, def_id: DefId) -> Instance< let instance = Instance::new( def_id, - InternalSubsts::for_item(tcx, def_id, |param, _| { + GenericArgs::for_item(tcx, def_id, |param, _| { if let ty::GenericParamDefKind::Lifetime = param.kind { tcx.lifetimes.re_erased.into() } else { |
