diff options
| author | bors <bors@rust-lang.org> | 2023-05-02 06:36:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-02 06:36:44 +0000 |
| commit | 7b99493492ad59c7a44c65373558175db42b4151 (patch) | |
| tree | 3175b32e64b2e498d623f3830be4faabd89ad892 /compiler/rustc_hir | |
| parent | 5133e154590991203c84702ef59482f729b19bbf (diff) | |
| parent | 2e3373c231fdd7ce607acd2339bfee501322e8c6 (diff) | |
| download | rust-7b99493492ad59c7a44c65373558175db42b4151.tar.gz | |
Auto merge of #111089 - Dylan-DPC:rollup-b8oj6du, r=Dylan-DPC
Rollup of 7 pull requests
Successful merges:
- #105076 (Refactor core::char::EscapeDefault and co. structures)
- #108161 (Add `ConstParamTy` trait)
- #108668 (Stabilize debugger_visualizer)
- #110512 (Fix elaboration with associated type bounds)
- #110895 (Remove `all` in target_thread_local cfg)
- #110955 (uplift `clippy::clone_double_ref` as `suspicious_double_ref_op`)
- #111048 (Mark`feature(return_position_impl_trait_in_trait)` and`feature(async_fn_in_trait)` as not incomplete)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_hir')
| -rw-r--r-- | compiler/rustc_hir/src/lang_items.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_hir/src/lang_items.rs b/compiler/rustc_hir/src/lang_items.rs index 8f91a96f964..e1c030d3e19 100644 --- a/compiler/rustc_hir/src/lang_items.rs +++ b/compiler/rustc_hir/src/lang_items.rs @@ -293,6 +293,8 @@ language_item_table! { PointerLike, sym::pointer_like, pointer_like, Target::Trait, GenericRequirement::Exact(0); + ConstParamTy, sym::const_param_ty, const_param_ty_trait, Target::Trait, GenericRequirement::Exact(0); + Poll, sym::Poll, poll, Target::Enum, GenericRequirement::None; PollReady, sym::Ready, poll_ready_variant, Target::Variant, GenericRequirement::None; PollPending, sym::Pending, poll_pending_variant, Target::Variant, GenericRequirement::None; |