user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

implemented code review

Browse source
This commit is contained in:
Virgil Palanciuc 2017-10-28 20:39:00 +03:00
parent 52d0e51473
commit 304c8b1eda
2 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/librustc/middle/stability.rs
View file

@ -18,6 +18,7 @@ use hir::def::Def;
use hir::def_id::{CrateNum, CRATE_DEF_INDEX, DefId, LOCAL_CRATE};
use ty::{self, TyCtxt};
use middle::privacy::AccessLevels;
use session::DiagnosticMessageId;
use syntax::symbol::Symbol;
use syntax_pos::{Span, MultiSpan, DUMMY_SP};
use syntax::ast;
@ -601,27 +602,25 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
let msp: MultiSpan = span.into();
let cm = &self.sess.parse_sess.codemap();
let span_key =
msp.primary_span().and_then(|sp:Span|
if sp != DUMMY_SP {
let fname = cm.lookup_char_pos(sp.lo()).file.as_ref().name.clone();
if fname.starts_with("<") && fname.ends_with(" macros>") {
None
} else {
Some(span)
}
} else {
let span_key = msp.primary_span().and_then(|sp: Span|
if sp != DUMMY_SP {
let file = cm.lookup_char_pos(sp.lo()).file;
if file.name.starts_with("<") && file.name.ends_with(" macros>") {
None
} else {
Some(span)
}
);
} else {
None
}
);
let tuple = (None, span_key, msg.clone());
let fresh = self.sess.one_time_diagnostics.borrow_mut().insert(tuple);
let error_id = (DiagnosticMessageId::StabilityId(issue), span_key, msg.clone());
let fresh = self.sess.one_time_diagnostics.borrow_mut().insert(error_id);
if fresh {
emit_feature_err(&self.sess.parse_sess, &feature.as_str(), span,
GateIssue::Library(Some(issue)), &msg);
}
}
Some(_) => {
// Stable APIs are always ok to call and deprecated APIs are