about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel E. Moelius III <sam@moeli.us>2021-02-24 06:12:27 -0500
committerSamuel E. Moelius III <sam@moeli.us>2021-02-24 06:21:46 -0500
commit8047458f404779c88a63e96dd4dd3599296c8d2e (patch)
tree49128bcdce90b4836e8874ef0f0c1464a73b7b31
parent489c4f00f96b9902bf223a0a2e72261063ccb2f4 (diff)
downloadrust-8047458f404779c88a63e96dd4dd3599296c8d2e.tar.gz
rust-8047458f404779c88a63e96dd4dd3599296c8d2e.zip
Move conf.rs back into clippy_lints
-rw-r--r--clippy_lints/src/lib.rs1
-rw-r--r--clippy_lints/src/utils/conf.rs (renamed from clippy_utils/src/conf.rs)0
-rw-r--r--clippy_lints/src/utils/mod.rs1
-rw-r--r--clippy_utils/src/lib.rs2
4 files changed, 2 insertions, 2 deletions
diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
index c8502e9cc74..5add8d44b42 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
index 7d7b35c2168..7d7b35c2168 100644
--- a/clippy_utils/src/conf.rs
+++ b/clippy_lints/src/utils/conf.rs
diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs
index 68ab8161e20..be9a07f8d7c 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 5e0f0f084cb..8e5cf5dc654 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;