From 8047458f404779c88a63e96dd4dd3599296c8d2e Mon Sep 17 00:00:00 2001 From: "Samuel E. Moelius III" Date: Wed, 24 Feb 2021 06:12:27 -0500 Subject: [PATCH] Move conf.rs back into clippy_lints --- clippy_lints/src/lib.rs | 1 + {clippy_utils/src => clippy_lints/src/utils}/conf.rs | 0 clippy_lints/src/utils/mod.rs | 1 + clippy_utils/src/lib.rs | 2 -- 4 files changed, 2 insertions(+), 2 deletions(-) rename {clippy_utils/src => clippy_lints/src/utils}/conf.rs (100%) diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index c8502e9cc74e..5add8d44b429 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -4,6 +4,7 @@ #![feature(box_syntax)] #![feature(drain_filter)] #![feature(in_band_lifetimes)] +#![feature(once_cell)] #![feature(or_patterns)] #![feature(rustc_private)] #![feature(stmt_expr_attributes)] diff --git a/clippy_utils/src/conf.rs b/clippy_lints/src/utils/conf.rs similarity index 100% rename from clippy_utils/src/conf.rs rename to clippy_lints/src/utils/conf.rs diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs index 68ab8161e20e..be9a07f8d7c9 100644 --- a/clippy_lints/src/utils/mod.rs +++ b/clippy_lints/src/utils/mod.rs @@ -1,4 +1,5 @@ pub mod author; +pub mod conf; pub mod inspector; #[cfg(feature = "internal-lints")] pub mod internal_lints; diff --git a/clippy_utils/src/lib.rs b/clippy_utils/src/lib.rs index 5e0f0f084cbe..8e5cf5dc6545 100644 --- a/clippy_utils/src/lib.rs +++ b/clippy_utils/src/lib.rs @@ -1,6 +1,5 @@ #![feature(box_patterns)] #![feature(in_band_lifetimes)] -#![feature(once_cell)] #![feature(or_patterns)] #![feature(rustc_private)] #![recursion_limit = "512"] @@ -32,7 +31,6 @@ pub mod ast_utils; pub mod attrs; pub mod camel_case; pub mod comparisons; -pub mod conf; pub mod consts; mod diagnostics; pub mod eager_or_lazy;