Auto merge of #6786 - smoelius:move-conf-rs-back-into-clippy-lints, r…

…=flip1995 Move conf.rs back into clippy_lints This is an alternative solution to #6785 to fix the CI break caused by #6756. changelog: none
rust-lang · Feb 24, 2021 · 1f77068 · 1f77068
2 parents 489c4f0 + 8047458
commit 1f77068
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git 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 → clippy_lints/src/utils/conf.rs b/clippy_utils/src/conf.rs → clippy_lints/src/utils/conf.rs
diff --git 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
@@ -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;