diff options
| author | bors <bors@rust-lang.org> | 2018-04-26 16:00:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-26 16:00:48 +0000 |
| commit | 949010d23e9f7037a8e6f323588873b3d2438fb1 (patch) | |
| tree | 5fc47e5862bd70b8728e6eb204c815f007c8dcad /src/librustdoc/html/render.rs | |
| parent | 88cd36714c6d62393f18d8efa2ea2724e1ec4a9d (diff) | |
| parent | a131c518ad640ccd12711ccd63d8b98cafa55ee9 (diff) | |
| download | rust-949010d23e9f7037a8e6f323588873b3d2438fb1.tar.gz rust-949010d23e9f7037a8e6f323588873b3d2438fb1.zip | |
Auto merge of #50228 - irinagpopa:backstory-v2, r=nikomatsakis
Rename rustc_back to rustc_target and move ABI code to it. Fixes #45226.
Diffstat (limited to 'src/librustdoc/html/render.rs')
| -rw-r--r-- | src/librustdoc/html/render.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 0ae946c4182..82449e9b5f9 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -54,7 +54,7 @@ use std::sync::Arc; use externalfiles::ExternalHtml; use serialize::json::{ToJson, Json, as_json}; -use syntax::{abi, ast}; +use syntax::ast; use syntax::codemap::FileName; use rustc::hir::def_id::{CrateNum, CRATE_DEF_INDEX, DefId}; use rustc::middle::privacy::AccessLevels; @@ -62,6 +62,7 @@ use rustc::middle::stability; use rustc::hir; use rustc::util::nodemap::{FxHashMap, FxHashSet}; use rustc_data_structures::flock; +use rustc_target::spec::abi; use clean::{self, AttributesExt, GetDefId, SelfTy, Mutability}; use doctree; |
