diff options
| author | David Haig <david@ninjasource.com> | 2019-11-25 13:38:08 +0000 |
|---|---|---|
| committer | David Haig <david@ninjasource.com> | 2019-11-28 07:43:53 +0000 |
| commit | fb0972dadf7b0c83519c88d5b5353d502feeef12 (patch) | |
| tree | b2dd5c13195dcb9e67fbffa9988dac996f88894a | |
| parent | ec41fda58bd7cf35f3506bba97d2a98a64b09498 (diff) | |
| download | rust-fb0972dadf7b0c83519c88d5b5353d502feeef12.tar.gz rust-fb0972dadf7b0c83519c88d5b5353d502feeef12.zip | |
Fixed merge issue
| -rw-r--r-- | src/librustc/mir/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/mir/mod.rs b/src/librustc/mir/mod.rs index d6048a1b394..b2832c78ef4 100644 --- a/src/librustc/mir/mod.rs +++ b/src/librustc/mir/mod.rs @@ -6,7 +6,7 @@ use crate::hir::def::{CtorKind, Namespace}; use crate::hir::def_id::DefId; -use crate::hir::GeneratorKind; +use crate::hir::{self, GeneratorKind}; use crate::mir::interpret::{GlobalAlloc, PanicInfo, Scalar}; use crate::mir::visit::MirVisitable; use crate::ty::adjustment::PointerCast; |