diff options
| author | bors <bors@rust-lang.org> | 2022-07-06 15:10:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-06 15:10:37 +0000 |
| commit | 049308cf8b48e9d67e54d6d0b01c10c79d1efc3a (patch) | |
| tree | beb9d9547194a26f8c61a8afb20da147847860b1 /compiler/rustc_mir_transform/src | |
| parent | 0aef72017f0db429d0a2f9fae36c9c5b5d0a1225 (diff) | |
| parent | 7f62a719afb3b7f1c0a4fed0c921e8b314636edb (diff) | |
| download | rust-049308cf8b48e9d67e54d6d0b01c10c79d1efc3a.tar.gz rust-049308cf8b48e9d67e54d6d0b01c10c79d1efc3a.zip | |
Auto merge of #98970 - Dylan-DPC:rollup-j0od37w, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #98881 (Only compute DefKind through the query.) - #98884 (macros: `LintDiagnostic` derive) - #98964 (fix typo in function name) - #98967 (fix typo in note about multiple inaccessible type aliases) - #98968 (assert Scalar sanity) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src')
| -rw-r--r-- | compiler/rustc_mir_transform/src/check_const_item_mutation.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_mir_transform/src/check_const_item_mutation.rs b/compiler/rustc_mir_transform/src/check_const_item_mutation.rs index 097a6186cd5..8838b14c53a 100644 --- a/compiler/rustc_mir_transform/src/check_const_item_mutation.rs +++ b/compiler/rustc_mir_transform/src/check_const_item_mutation.rs @@ -1,5 +1,4 @@ -use rustc_errors::DiagnosticBuilder; -use rustc_middle::lint::LintDiagnosticBuilder; +use rustc_errors::{DiagnosticBuilder, LintDiagnosticBuilder}; use rustc_middle::mir::visit::Visitor; use rustc_middle::mir::*; use rustc_middle::ty::TyCtxt; |