diff options
| author | bors <bors@rust-lang.org> | 2019-02-13 05:14:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-13 05:14:12 +0000 |
| commit | 827a141466e7bb85eb3c030600878a2c606019e9 (patch) | |
| tree | cbbbb0b46cf4a3694316b2462ae2dcf7321468e4 /src/libsyntax/source_map.rs | |
| parent | 0f949c2fcc696d0260a99196d5e5400c59a26a54 (diff) | |
| parent | 6562c2860730aee4497f58b00c298d054ff2e0b7 (diff) | |
| download | rust-827a141466e7bb85eb3c030600878a2c606019e9.tar.gz rust-827a141466e7bb85eb3c030600878a2c606019e9.zip | |
Auto merge of #58415 - Centril:rollup, r=Centril
Rollup of 12 pull requests Successful merges: - #57693 (Doc rewording) - #57815 (Speed up the fast path for assert_eq! and assert_ne!) - #58034 (Stabilize the time_checked_add feature) - #58057 (Stabilize linker-plugin based LTO (aka cross-language LTO)) - #58137 (Cleanup: rename node_id_to_type(_opt)) - #58166 (allow shorthand syntax for deprecation reason) - #58200 (fix str mutating through a ptr derived from &self) - #58273 (Rename rustc_errors dependency in rust 2018 crates) - #58289 (impl iter() for dyn Error) - #58387 (Disallow `auto` trait alias syntax) - #58404 (use Ubuntu keyserver for CloudABI ports) - #58405 (Remove some dead code from libcore) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/source_map.rs')
| -rw-r--r-- | src/libsyntax/source_map.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/source_map.rs b/src/libsyntax/source_map.rs index 1784bad0362..62a6972122a 100644 --- a/src/libsyntax/source_map.rs +++ b/src/libsyntax/source_map.rs @@ -24,7 +24,7 @@ use std::fs; use std::io; use log::debug; -use crate::errors::SourceMapper; +use errors::SourceMapper; /// Returns the span itself if it doesn't come from a macro expansion, /// otherwise return the call site span up to the `enclosing_sp` by |