diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-02-13 04:37:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 04:37:04 +0100 |
| commit | 0bc8f6f3f4ecfa3309aaa4df52fb4aa1ddd63b07 (patch) | |
| tree | 9e9acdc1fafa0a30b951815b4c6ca3a3214077e0 /src/libsyntax/json.rs | |
| parent | ecb650316983697cca65b9b265692e4385a67d9c (diff) | |
| parent | c08b5ca4ad26250f6af17ba7e2938d9e694f2842 (diff) | |
| download | rust-0bc8f6f3f4ecfa3309aaa4df52fb4aa1ddd63b07.tar.gz rust-0bc8f6f3f4ecfa3309aaa4df52fb4aa1ddd63b07.zip | |
Rollup merge of #58273 - taiki-e:rename-dependency, r=matthewjasper
Rename rustc_errors dependency in rust 2018 crates I think this is a better solution than `use rustc_errors as errors` in `lib.rs` and `use crate::errors` in modules. Related: rust-lang/cargo#5653 cc #58099 r? @Centril
Diffstat (limited to 'src/libsyntax/json.rs')
| -rw-r--r-- | src/libsyntax/json.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libsyntax/json.rs b/src/libsyntax/json.rs index af785050532..9acd0d099a0 100644 --- a/src/libsyntax/json.rs +++ b/src/libsyntax/json.rs @@ -10,12 +10,13 @@ // FIXME: spec the JSON output properly. use crate::source_map::{SourceMap, FilePathMapping}; -use crate::errors::registry::Registry; -use crate::errors::{DiagnosticBuilder, SubDiagnostic, CodeSuggestion, SourceMapper}; -use crate::errors::{DiagnosticId, Applicability}; -use crate::errors::emitter::{Emitter, EmitterWriter}; -use syntax_pos::{self, MacroBacktrace, Span, SpanLabel, MultiSpan}; +use errors::registry::Registry; +use errors::{DiagnosticBuilder, SubDiagnostic, CodeSuggestion, SourceMapper}; +use errors::{DiagnosticId, Applicability}; +use errors::emitter::{Emitter, EmitterWriter}; + +use syntax_pos::{MacroBacktrace, Span, SpanLabel, MultiSpan}; use rustc_data_structures::sync::{self, Lrc}; use std::io::{self, Write}; use std::vec; |
