diff options
| author | Camille GILLOT <gillot.camille@gmail.com> | 2020-04-19 13:00:18 +0200 |
|---|---|---|
| committer | Camille GILLOT <gillot.camille@gmail.com> | 2020-05-08 13:13:15 +0200 |
| commit | d4e143ed2f248a808fb5f1cf959f630d419cc01b (patch) | |
| tree | 4418c7d53db14542c6eb4736aa2a308d2447bde9 /src/librustc_infer | |
| parent | a51e004e1bf7f9bba151dd9104a217c1ace6a0a2 (diff) | |
| download | rust-d4e143ed2f248a808fb5f1cf959f630d419cc01b.tar.gz rust-d4e143ed2f248a808fb5f1cf959f630d419cc01b.zip | |
Remove ast::{Ident, Name} reexports.
Diffstat (limited to 'src/librustc_infer')
| -rw-r--r-- | src/librustc_infer/infer/mod.rs | 5 | ||||
| -rw-r--r-- | src/librustc_infer/traits/error_reporting/mod.rs | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/librustc_infer/infer/mod.rs b/src/librustc_infer/infer/mod.rs index 2cf9dd882e4..67632a97df7 100644 --- a/src/librustc_infer/infer/mod.rs +++ b/src/librustc_infer/infer/mod.rs @@ -10,7 +10,6 @@ pub(crate) use self::undo_log::{InferCtxtUndoLogs, Snapshot, UndoLog}; use crate::traits::{self, ObligationCause, PredicateObligations, TraitEngine}; -use rustc_ast::ast; use rustc_data_structures::fx::{FxHashMap, FxHashSet}; use rustc_data_structures::sync::Lrc; use rustc_data_structures::undo_log::Rollback; @@ -457,7 +456,7 @@ pub enum SubregionOrigin<'tcx> { /// the containing trait. CompareImplMethodObligation { span: Span, - item_name: ast::Name, + item_name: Symbol, impl_item_def_id: DefId, trait_item_def_id: DefId, }, @@ -519,7 +518,7 @@ pub enum RegionVariableOrigin { UpvarRegion(ty::UpvarId, Span), - BoundRegionInCoherence(ast::Name), + BoundRegionInCoherence(Symbol), /// This origin is used for the inference variables that we create /// during NLL region processing. diff --git a/src/librustc_infer/traits/error_reporting/mod.rs b/src/librustc_infer/traits/error_reporting/mod.rs index 2ae7b2ff925..f873358ff9f 100644 --- a/src/librustc_infer/traits/error_reporting/mod.rs +++ b/src/librustc_infer/traits/error_reporting/mod.rs @@ -1,12 +1,12 @@ use super::ObjectSafetyViolation; use crate::infer::InferCtxt; -use rustc_ast::ast; use rustc_data_structures::fx::FxHashSet; use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder}; use rustc_hir as hir; use rustc_hir::def_id::DefId; use rustc_middle::ty::TyCtxt; +use rustc_span::symbol::Symbol; use rustc_span::Span; use std::fmt; @@ -14,7 +14,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> { pub fn report_extra_impl_obligation( &self, error_span: Span, - item_name: ast::Name, + item_name: Symbol, _impl_item_def_id: DefId, trait_item_def_id: DefId, requirement: &dyn fmt::Display, |
