Skip to content

Commit

Permalink
Fix rebase fail
Browse files Browse the repository at this point in the history
  • Loading branch information
taiki-e committed Feb 12, 2019
1 parent c360ba2 commit c08b5ca
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustc_resolve/error_reporting.rs
Original file line number Diff line number Diff line change
@@ -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::*;
Expand All @@ -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};
Expand Down

0 comments on commit c08b5ca

Please sign in to comment.