nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 08:13:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate sess.opts.tests uses to sess.is_test_crate()

Browse Source
This commit is contained in:
blyxyas 2023-04-09 21:37:31 +02:00
parent 28e19f19aa
commit 2c976765b8
No known key found for this signature in database
GPG Key ID: 4D38170B5A2FC334
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_builtin_macros/src/test_harness.rs
View File

@ -53,7 +53,7 @@ pub fn inject(krate: &mut ast::Crate, sess: &Session, resolver: &mut dyn Resolve
// even in non-test builds // even in non-test builds
let test_runner = get_test_runner(span_diagnostic, &krate); let test_runner = get_test_runner(span_diagnostic, &krate);
if sess.opts.test { if sess.is_test_crate() {
let panic_strategy = match (panic_strategy, sess.opts.unstable_opts.panic_abort_tests) { let panic_strategy = match (panic_strategy, sess.opts.unstable_opts.panic_abort_tests) {
(PanicStrategy::Abort, true) => PanicStrategy::Abort, (PanicStrategy::Abort, true) => PanicStrategy::Abort,
(PanicStrategy::Abort, false) => { (PanicStrategy::Abort, false) => {

2
compiler/rustc_codegen_ssa/src/back/link.rs
View File

@ -2301,7 +2301,7 @@ fn add_native_libs_from_crate(
|| (whole_archive == None || (whole_archive == None
&& bundle && bundle
&& cnum == LOCAL_CRATE && cnum == LOCAL_CRATE
&& sess.opts.test); && sess.is_test_crate());
if bundle && cnum != LOCAL_CRATE { if bundle && cnum != LOCAL_CRATE {
if let Some(filename) = lib.filename { if let Some(filename) = lib.filename {

4
compiler/rustc_interface/src/passes.rs
View File

@ -230,7 +230,7 @@ fn configure_and_expand(
features: Some(features), features: Some(features),
recursion_limit, recursion_limit,
trace_mac: sess.opts.unstable_opts.trace_macros, trace_mac: sess.opts.unstable_opts.trace_macros,
should_test: sess.opts.test, should_test: sess.is_test_crate(),
span_debug: sess.opts.unstable_opts.span_debug, span_debug: sess.opts.unstable_opts.span_debug,
proc_macro_backtrace: sess.opts.unstable_opts.proc_macro_backtrace, proc_macro_backtrace: sess.opts.unstable_opts.proc_macro_backtrace,
..rustc_expand::expand::ExpansionConfig::default(crate_name.to_string()) ..rustc_expand::expand::ExpansionConfig::default(crate_name.to_string())
@ -292,7 +292,7 @@ fn configure_and_expand(
} }
sess.time("maybe_create_a_macro_crate", || { sess.time("maybe_create_a_macro_crate", || {
let is_test_crate = sess.opts.test; let is_test_crate = sess.is_test_crate();
rustc_builtin_macros::proc_macro_harness::inject( rustc_builtin_macros::proc_macro_harness::inject(
&mut krate, &mut krate,
sess, sess,

2
compiler/rustc_passes/src/stability.rs
View File

@ -530,7 +530,7 @@ struct MissingStabilityAnnotations<'tcx> {
impl<'tcx> MissingStabilityAnnotations<'tcx> { impl<'tcx> MissingStabilityAnnotations<'tcx> {
fn check_missing_stability(&self, def_id: LocalDefId, span: Span) { fn check_missing_stability(&self, def_id: LocalDefId, span: Span) {
let stab = self.tcx.stability().local_stability(def_id); let stab = self.tcx.stability().local_stability(def_id);
if !self.tcx.sess.opts.test if !self.tcx.sess.is_test_crate()
&& stab.is_none() && stab.is_none()
&& self.effective_visibilities.is_reachable(def_id) && self.effective_visibilities.is_reachable(def_id)
{ {

2
compiler/rustc_resolve/src/check_unused.rs
View File

@ -393,7 +393,7 @@ impl Resolver<'_, '_> {
// If we are in the `--test` mode, suppress a help that adds the `#[cfg(test)]` // If we are in the `--test` mode, suppress a help that adds the `#[cfg(test)]`
// attribute; however, if not, suggest adding the attribute. There is no way to // attribute; however, if not, suggest adding the attribute. There is no way to
// retrieve attributes here because we do not have a `TyCtxt` yet. // retrieve attributes here because we do not have a `TyCtxt` yet.
let test_module_span = if tcx.sess.opts.test { let test_module_span = if tcx.sess.is_test_crate() {
None None
} else { } else {
let parent_module = visitor.r.get_nearest_non_block_module( let parent_module = visitor.r.get_nearest_non_block_module(

2
compiler/rustc_session/src/config.rs
View File

@ -1258,7 +1258,7 @@ pub fn build_configuration(sess: &Session, mut user_cfg: CrateConfig) -> CrateCo
// some default and generated configuration items. // some default and generated configuration items.
let default_cfg = default_configuration(sess); let default_cfg = default_configuration(sess);
// If the user wants a test runner, then add the test cfg. // If the user wants a test runner, then add the test cfg.
if sess.opts.test { if sess.is_test_crate() {
user_cfg.insert((sym::test, None)); user_cfg.insert((sym::test, None));
} }
user_cfg.extend(default_cfg.iter().cloned()); user_cfg.extend(default_cfg.iter().cloned());