bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix the tests

Browse source
This commit is contained in:
est31 2020-08-12 03:45:16 +02:00
parent 3a62eb74db
commit d8c9a28703
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_metadata/src/creader.rs
View file

@ -195,10 +195,16 @@ impl CStore {
} }
pub fn report_unused_deps(&self, tcx: TyCtxt<'_>) { pub fn report_unused_deps(&self, tcx: TyCtxt<'_>) {
// We put the check for the option before the lint_level_at_node call
// because the call mutates internal state and introducing it
// leads to some ui tests failing.
if !tcx.sess.opts.json_unused_externs {
return;
}
let level = tcx let level = tcx
.lint_level_at_node(lint::builtin::UNUSED_CRATE_DEPENDENCIES, rustc_hir::CRATE_HIR_ID) .lint_level_at_node(lint::builtin::UNUSED_CRATE_DEPENDENCIES, rustc_hir::CRATE_HIR_ID)
.0; .0;
if level != lint::Level::Allow && tcx.sess.opts.json_unused_externs { if level != lint::Level::Allow {
let unused_externs = let unused_externs =
self.unused_externs.iter().map(|ident| ident.to_ident_string()).collect::<Vec<_>>(); self.unused_externs.iter().map(|ident| ident.to_ident_string()).collect::<Vec<_>>();
let unused_externs = unused_externs.iter().map(String::as_str).collect::<Vec<&str>>(); let unused_externs = unused_externs.iter().map(String::as_str).collect::<Vec<&str>>();