|
13 | 13 |
|
14 | 14 | pub use self::StabilityLevel::*; |
15 | 15 |
|
16 | | -use hir::map as hir_map; |
17 | 16 | use lint; |
18 | 17 | use hir::def::Def; |
19 | 18 | use hir::def_id::{CrateNum, CRATE_DEF_INDEX, DefId, DefIndex, LOCAL_CRATE}; |
20 | 19 | use ty::{self, TyCtxt}; |
21 | 20 | use middle::privacy::AccessLevels; |
| 21 | +use session::Session; |
22 | 22 | use syntax::symbol::Symbol; |
23 | 23 | use syntax_pos::{Span, DUMMY_SP}; |
24 | 24 | use syntax::ast; |
@@ -123,7 +123,7 @@ impl<'a, 'tcx: 'a> Annotator<'a, 'tcx> { |
123 | 123 | item_sp: Span, kind: AnnotationKind, visit_children: F) |
124 | 124 | where F: FnOnce(&mut Self) |
125 | 125 | { |
126 | | - if self.index.staged_api[&LOCAL_CRATE] && self.tcx.sess.features.borrow().staged_api { |
| 126 | + if self.index.staged_api[&LOCAL_CRATE] { |
127 | 127 | debug!("annotate(id = {:?}, attrs = {:?})", id, attrs); |
128 | 128 | if let Some(..) = attr::find_deprecation(self.tcx.sess.diagnostic(), attrs, item_sp) { |
129 | 129 | self.tcx.sess.span_err(item_sp, "`#[deprecated]` cannot be used in staged api, \ |
@@ -390,20 +390,36 @@ impl<'a, 'tcx> Index<'tcx> { |
390 | 390 | parent_depr: None, |
391 | 391 | in_trait_impl: false, |
392 | 392 | }; |
| 393 | + |
| 394 | + // If the `-Z force-unstable-if-unmarked` flag is passed then we provide |
| 395 | + // a parent stability annotation which indicates that this is private |
| 396 | + // with the `rustc_private` feature. This is intended for use when |
| 397 | + // compiling librustc crates themselves so we can leverage crates.io |
| 398 | + // while maintaining the invariant that all sysroot crates are unstable |
| 399 | + // by default and are unable to be used. |
| 400 | + if tcx.sess.opts.debugging_opts.force_unstable_if_unmarked { |
| 401 | + let reason = "this crate is being loaded from the sysroot, and \ |
| 402 | + unstable location; did you mean to load this crate \ |
| 403 | + from crates.io via `Cargo.toml` instead?"; |
| 404 | + let stability = tcx.intern_stability(Stability { |
| 405 | + level: attr::StabilityLevel::Unstable { |
| 406 | + reason: Some(Symbol::intern(reason)), |
| 407 | + issue: 27812, |
| 408 | + }, |
| 409 | + feature: Symbol::intern("rustc_private"), |
| 410 | + rustc_depr: None, |
| 411 | + }); |
| 412 | + annotator.parent_stab = Some(stability); |
| 413 | + } |
| 414 | + |
393 | 415 | annotator.annotate(ast::CRATE_NODE_ID, &krate.attrs, krate.span, AnnotationKind::Required, |
394 | 416 | |v| intravisit::walk_crate(v, krate)); |
395 | 417 | } |
396 | 418 |
|
397 | | - pub fn new(hir_map: &hir_map::Map) -> Index<'tcx> { |
398 | | - let krate = hir_map.krate(); |
399 | | - |
400 | | - let mut is_staged_api = false; |
401 | | - for attr in &krate.attrs { |
402 | | - if attr.path == "stable" || attr.path == "unstable" { |
403 | | - is_staged_api = true; |
404 | | - break |
405 | | - } |
406 | | - } |
| 419 | + pub fn new(sess: &Session) -> Index<'tcx> { |
| 420 | + let is_staged_api = |
| 421 | + sess.opts.debugging_opts.force_unstable_if_unmarked || |
| 422 | + sess.features.borrow().staged_api; |
407 | 423 |
|
408 | 424 | let mut staged_api = FxHashMap(); |
409 | 425 | staged_api.insert(LOCAL_CRATE, is_staged_api); |
@@ -496,8 +512,10 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> { |
496 | 512 | } |
497 | 513 | } |
498 | 514 |
|
499 | | - let is_staged_api = *self.stability.borrow_mut().staged_api.entry(def_id.krate) |
500 | | - .or_insert_with(|| self.sess.cstore.is_staged_api(def_id.krate)); |
| 515 | + let is_staged_api = self.lookup_stability(DefId { |
| 516 | + index: CRATE_DEF_INDEX, |
| 517 | + ..def_id |
| 518 | + }).is_some(); |
501 | 519 | if !is_staged_api { |
502 | 520 | return; |
503 | 521 | } |
@@ -530,15 +548,32 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> { |
530 | 548 |
|
531 | 549 | match stability { |
532 | 550 | Some(&Stability { level: attr::Unstable {ref reason, issue}, ref feature, .. }) => { |
533 | | - if !self.stability.borrow().active_features.contains(feature) { |
534 | | - let msg = match *reason { |
535 | | - Some(ref r) => format!("use of unstable library feature '{}': {}", |
536 | | - feature.as_str(), &r), |
537 | | - None => format!("use of unstable library feature '{}'", &feature) |
538 | | - }; |
539 | | - emit_feature_err(&self.sess.parse_sess, &feature.as_str(), span, |
540 | | - GateIssue::Library(Some(issue)), &msg); |
| 551 | + if self.stability.borrow().active_features.contains(feature) { |
| 552 | + return |
541 | 553 | } |
| 554 | + |
| 555 | + // When we're compiling the compiler itself we may pull in |
| 556 | + // crates from crates.io, but those crates may depend on other |
| 557 | + // crates also pulled in from crates.io. We want to ideally be |
| 558 | + // able to compile everything without requiring upstream |
| 559 | + // modifications, so in the case that this looks like a |
| 560 | + // rustc_private crate (e.g. a compiler crate) and we also have |
| 561 | + // the `-Z force-unstable-if-unmarked` flag present (we're |
| 562 | + // compiling a compiler crate), then let this missing feature |
| 563 | + // annotation slide. |
| 564 | + if *feature == "rustc_private" && issue == 27812 { |
| 565 | + if self.sess.opts.debugging_opts.force_unstable_if_unmarked { |
| 566 | + return |
| 567 | + } |
| 568 | + } |
| 569 | + |
| 570 | + let msg = match *reason { |
| 571 | + Some(ref r) => format!("use of unstable library feature '{}': {}", |
| 572 | + feature.as_str(), &r), |
| 573 | + None => format!("use of unstable library feature '{}'", &feature) |
| 574 | + }; |
| 575 | + emit_feature_err(&self.sess.parse_sess, &feature.as_str(), span, |
| 576 | + GateIssue::Library(Some(issue)), &msg); |
542 | 577 | } |
543 | 578 | Some(_) => { |
544 | 579 | // Stable APIs are always ok to call and deprecated APIs are |
@@ -658,7 +693,7 @@ pub fn check_unused_or_stable_features<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) { |
658 | 693 |
|
659 | 694 | let access_levels = &tcx.privacy_access_levels(LOCAL_CRATE); |
660 | 695 |
|
661 | | - if tcx.stability.borrow().staged_api[&LOCAL_CRATE] && tcx.sess.features.borrow().staged_api { |
| 696 | + if tcx.stability.borrow().staged_api[&LOCAL_CRATE] { |
662 | 697 | let krate = tcx.hir.krate(); |
663 | 698 | let mut missing = MissingStabilityAnnotations { |
664 | 699 | tcx: tcx, |
|
0 commit comments