about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-11-02 16:32:10 +0000
committerbors <bors@rust-lang.org>2023-11-02 16:32:10 +0000
commit09ac14c901abc43bd0d617ae4a44e8a4fed98d9c (patch)
tree064f1cd44830010b8ad05c7fcf43408fe7162b18 /src
parent01a0a3666681b88c3cab5ffc440bdd74352093dd (diff)
parent62a82b361c02838afdf607d461726e0407f1a5ec (diff)
Auto merge of #11747 - flip1995:rustup, r=flip1995
Rustup

r? `@ghost`

changelog: none
Diffstat (limited to 'src')
-rw-r--r--src/driver.rs10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/driver.rs b/src/driver.rs
index 17d57c30f08..7bb49d08da6 100644
--- a/src/driver.rs
+++ b/src/driver.rs
@@ -178,7 +178,7 @@ pub fn main() {
 
     rustc_driver::init_rustc_env_logger(&handler);
 
-    rustc_driver::install_ice_hook(BUG_REPORT_URL, |handler| {
+    let using_internal_features = rustc_driver::install_ice_hook(BUG_REPORT_URL, |handler| {
         // FIXME: this macro calls unwrap internally but is called in a panicking context!  It's not
         // as simple as moving the call from the hook to main, because `install_ice_hook` doesn't
         // accept a generic closure.
@@ -265,9 +265,13 @@ pub fn main() {
         let clippy_enabled = !cap_lints_allow && (!no_deps || in_primary_package);
         if clippy_enabled {
             args.extend(clippy_args);
-            rustc_driver::RunCompiler::new(&args, &mut ClippyCallbacks { clippy_args_var }).run()
+            rustc_driver::RunCompiler::new(&args, &mut ClippyCallbacks { clippy_args_var })
+                .set_using_internal_features(using_internal_features)
+                .run()
         } else {
-            rustc_driver::RunCompiler::new(&args, &mut RustcCallbacks { clippy_args_var }).run()
+            rustc_driver::RunCompiler::new(&args, &mut RustcCallbacks { clippy_args_var })
+                .set_using_internal_features(using_internal_features)
+                .run()
         }
     }))
 }