diff options
| author | bors <bors@rust-lang.org> | 2023-05-17 15:17:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-17 15:17:13 +0000 |
| commit | ad23942ad4079f779651983b262fa34c0beda701 (patch) | |
| tree | c531783a8a7eecefef323d6a2fe2a3bd22d363ea /compiler/rustc_monomorphize/src/lib.rs | |
| parent | c2ccc855e74aec03e434405eca3c247ee2432e53 (diff) | |
| parent | b0d92c2b7060cf434fcc738b3fabf69410244cd3 (diff) | |
| download | rust-ad23942ad4079f779651983b262fa34c0beda701.tar.gz | |
Auto merge of #111680 - Dylan-DPC:rollup-1p45gxt, r=Dylan-DPC
Rollup of 6 pull requests
Successful merges:
- #110930 (Don't expect normalization to succeed in elaborate_drops)
- #111557 (Revert "Validate resolution for SelfCtor too.")
- #111565 (rustdoc-json: Add tests for visibility of impls)
- #111588 (Emits E0599 when meeting `MyTrait::missing_method`)
- #111625 (Move rustc_middle/src/ty/query.rs to rustc_middle/src/query/plumbing.rs)
- #111674 (Add missing backslash in HTML string)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_monomorphize/src/lib.rs')
| -rw-r--r-- | compiler/rustc_monomorphize/src/lib.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_monomorphize/src/lib.rs b/compiler/rustc_monomorphize/src/lib.rs index 1c18e6b0b02..ecc50c3f664 100644 --- a/compiler/rustc_monomorphize/src/lib.rs +++ b/compiler/rustc_monomorphize/src/lib.rs @@ -12,10 +12,9 @@ extern crate rustc_middle; use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage}; use rustc_fluent_macro::fluent_messages; use rustc_hir::lang_items::LangItem; -use rustc_middle::query::Providers; +use rustc_middle::query::{Providers, TyCtxtAt}; use rustc_middle::traits; use rustc_middle::ty::adjustment::CustomCoerceUnsized; -use rustc_middle::ty::query::TyCtxtAt; use rustc_middle::ty::{self, Ty}; mod collector; |