let (tests, unused_extern_reports, compiling_test_count) =
interface::run_compiler(config, |compiler| {
compiler.enter(|queries| {
- let mut global_ctxt = queries.global_ctxt()?.take();
-
- let collector = global_ctxt.enter(|tcx| {
+ let collector = queries.global_ctxt()?.enter(|tcx| {
let crate_attrs = tcx.hir().attrs(CRATE_HIR_ID);
let opts = scrape_test_config(crate_attrs);
let unused_extern_reports = collector.unused_extern_reports.clone();
let compiling_test_count = collector.compiling_test_count.load(Ordering::SeqCst);
- let ret: Result<_, ErrorGuaranteed> =
- Ok((collector.tests, unused_extern_reports, compiling_test_count));
- ret
+ Ok((collector.tests, unused_extern_reports, compiling_test_count))
})
})?;
) {
let ast_attrs = self.tcx.hir().attrs(hir_id);
if let Some(ref cfg) = ast_attrs.cfg(self.tcx, &FxHashSet::default()) {
- if !cfg.matches(&self.sess.parse_sess, Some(self.sess.features_untracked())) {
+ if !cfg.matches(&self.sess.parse_sess, Some(self.tcx.features())) {
return;
}
}