diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-06-17 20:34:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-17 20:34:51 +0200 |
| commit | 940ff24ec00122e7a0c9099fcd5ea7db41555d3a (patch) | |
| tree | fe9b608bfaf09dddb0e4443aa2fd87890c58ff21 /compiler/rustc_codegen_cranelift/src/constant.rs | |
| parent | 3c5ff6efd3e8f97fe2c5946111efd28830dc2626 (diff) | |
| parent | 342c1b03d6d0f9aa1e8119a2556d819af024faaf (diff) | |
| download | rust-940ff24ec00122e7a0c9099fcd5ea7db41555d3a.tar.gz rust-940ff24ec00122e7a0c9099fcd5ea7db41555d3a.zip | |
Rollup merge of #126567 - compiler-errors:instance-kind, r=oli-obk,lcnr
Rename `InstanceDef` -> `InstanceKind` Renames `InstanceDef` to `InstanceKind`. The `Def` here is confusing, and makes it hard to distinguish `Instance` and `InstanceDef`. `InstanceKind` makes this more obvious, since it's really just describing what *kind* of instance we have. Not sure if this is large enough to warrant a types team MCP -- it's only 53 files. I don't personally think it does, but happy to write one if anyone disagrees. cc ``@rust-lang/types`` r? types
Diffstat (limited to 'compiler/rustc_codegen_cranelift/src/constant.rs')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/constant.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/constant.rs b/compiler/rustc_codegen_cranelift/src/constant.rs index a53598018f4..87c5da3b7c3 100644 --- a/compiler/rustc_codegen_cranelift/src/constant.rs +++ b/compiler/rustc_codegen_cranelift/src/constant.rs @@ -50,7 +50,7 @@ pub(crate) fn codegen_tls_ref<'tcx>( ) -> CValue<'tcx> { let tls_ptr = if !def_id.is_local() && fx.tcx.needs_thread_local_shim(def_id) { let instance = ty::Instance { - def: ty::InstanceDef::ThreadLocalShim(def_id), + def: ty::InstanceKind::ThreadLocalShim(def_id), args: ty::GenericArgs::empty(), }; let func_ref = fx.get_function_ref(instance); |
