diff options
| author | Taiki Endo <te316e89@gmail.com> | 2019-02-10 15:27:59 +0900 |
|---|---|---|
| committer | Taiki Endo <te316e89@gmail.com> | 2019-02-13 00:31:53 +0900 |
| commit | c08b5ca4ad26250f6af17ba7e2938d9e694f2842 (patch) | |
| tree | 814b1d2d2e229dfcc1fc4706cdbfa59474896d72 | |
| parent | c360ba285c5a74ce659811a0c72fb7bf32ec0b85 (diff) | |
| download | rust-c08b5ca4ad26250f6af17ba7e2938d9e694f2842.tar.gz rust-c08b5ca4ad26250f6af17ba7e2938d9e694f2842.zip | |
Fix rebase fail
| -rw-r--r-- | src/librustc_resolve/error_reporting.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_resolve/error_reporting.rs b/src/librustc_resolve/error_reporting.rs index 8300e691bbe..0cabee71df9 100644 --- a/src/librustc_resolve/error_reporting.rs +++ b/src/librustc_resolve/error_reporting.rs @@ -1,5 +1,6 @@ use std::cmp::Reverse; +use errors::{Applicability, DiagnosticBuilder, DiagnosticId}; use log::debug; use rustc::hir::def::*; use rustc::hir::def::Namespace::*; @@ -9,7 +10,6 @@ use syntax::ast::{ExprKind}; use syntax::symbol::keywords; use syntax_pos::Span; -use crate::errors::{Applicability, DiagnosticBuilder, DiagnosticId}; use crate::macros::ParentScope; use crate::resolve_imports::ImportResolver; use crate::{import_candidate_to_enum_paths, is_self_type, is_self_value, path_names_to_string}; |