From c5a61319da34e931072f2ffe3d12e530034c8c07 Mon Sep 17 00:00:00 2001 From: Dan Aloni Date: Thu, 3 Sep 2020 09:30:51 +0300 Subject: [PATCH] rustc_driver: have TrimmedDefPaths::GoodPath only for rustc `run_compiler` is used by clippy and other tools, which should not have the trimmed paths feature enabled by default, until we see it works well for them. Would also be nice to rename `TimePassesCallbacks` however it's a submodule change. --- compiler/rustc_driver/src/lib.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/compiler/rustc_driver/src/lib.rs b/compiler/rustc_driver/src/lib.rs index d989d0041c5..c6e7553f35a 100644 --- a/compiler/rustc_driver/src/lib.rs +++ b/compiler/rustc_driver/src/lib.rs @@ -127,6 +127,7 @@ impl Callbacks for TimePassesCallbacks { // time because it will mess up the --prints output. See #64339. self.time_passes = config.opts.prints.is_empty() && (config.opts.debugging_opts.time_passes || config.opts.debugging_opts.time); + config.opts.trimmed_def_paths = TrimmedDefPaths::GoodPath; } } @@ -159,10 +160,7 @@ pub fn run_compiler( None => return Ok(()), }; - let sopts = config::Options { - trimmed_def_paths: TrimmedDefPaths::GoodPath, - ..config::build_session_options(&matches) - }; + let sopts = config::build_session_options(&matches); let cfg = interface::parse_cfgspecs(matches.opt_strs("cfg")); let mut dummy_config = |sopts, cfg, diagnostic_output| {