diff options
| author | Philipp Krones <hello@philkrones.com> | 2023-11-02 17:01:56 +0100 |
|---|---|---|
| committer | Philipp Krones <hello@philkrones.com> | 2023-11-02 17:24:19 +0100 |
| commit | 95dc7be92f8087ae3c8b9532f2674dabceee3d4d (patch) | |
| tree | ef0c270a62fecc20762256ced06e1a8db9ccb74c /src | |
| parent | 2e907aa90c67d73fadc9be54c6609f618045c10c (diff) | |
| parent | 01a0a3666681b88c3cab5ffc440bdd74352093dd (diff) | |
| download | rust-95dc7be92f8087ae3c8b9532f2674dabceee3d4d.tar.gz rust-95dc7be92f8087ae3c8b9532f2674dabceee3d4d.zip | |
Merge remote-tracking branch 'upstream/master' into rustup
Diffstat (limited to 'src')
| -rw-r--r-- | src/driver.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/driver.rs b/src/driver.rs index 11290f88a49..74f8ed69b4d 100644 --- a/src/driver.rs +++ b/src/driver.rs @@ -126,7 +126,7 @@ impl rustc_driver::Callbacks for ClippyCallbacks { // JUSTIFICATION: necessary in clippy driver to set `mir_opt_level` #[allow(rustc::bad_opt_access)] fn config(&mut self, config: &mut interface::Config) { - let conf_path = clippy_lints::lookup_conf_file(); + let conf_path = clippy_config::lookup_conf_file(); let previous = config.register_lints.take(); let clippy_args_var = self.clippy_args_var.take(); config.parse_sess_created = Some(Box::new(move |parse_sess| { @@ -147,7 +147,7 @@ impl rustc_driver::Callbacks for ClippyCallbacks { (previous)(sess, lint_store); } - let conf = clippy_lints::Conf::read(sess, &conf_path); + let conf = clippy_config::Conf::read(sess, &conf_path); clippy_lints::register_plugins(lint_store, sess, conf); clippy_lints::register_pre_expansion_lints(lint_store, conf); clippy_lints::register_renamed(lint_store); |