about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-12 06:46:21 +0000
committerbors <bors@rust-lang.org>2018-12-12 06:46:21 +0000
commitf26c39bab7ae3f8e570cb85fc4337fcd70046dfd (patch)
tree5e948b11354328589c4f36ffabae587259b4045a
parente2608fc27231d12a360915c9cb60de5219a22505 (diff)
parentee2abc36a33bbbb6d84f823cb5e09b4603af1f32 (diff)
downloadrust-f26c39bab7ae3f8e570cb85fc4337fcd70046dfd.tar.gz
rust-f26c39bab7ae3f8e570cb85fc4337fcd70046dfd.zip
Auto merge of #3533 - phansch:add_to_doc_valid_idents, r=phansch
Add 'CamelCase' to doc_valid_idents

Fixes #2395
-rw-r--r--clippy_lints/src/utils/conf.rs1
-rw-r--r--tests/ui/doc.rs3
2 files changed, 4 insertions, 0 deletions
diff --git a/clippy_lints/src/utils/conf.rs b/clippy_lints/src/utils/conf.rs
index 63e2db7506c..35fcc08b518 100644
--- a/clippy_lints/src/utils/conf.rs
+++ b/clippy_lints/src/utils/conf.rs
@@ -137,6 +137,7 @@ define_Conf! {
         "iOS", "macOS",
         "TeX", "LaTeX", "BibTeX", "BibLaTeX",
         "MinGW",
+        "CamelCase",
     ] => Vec<String>),
     /// Lint: TOO_MANY_ARGUMENTS. The maximum number of argument a function or method can have
     (too_many_arguments_threshold, "too_many_arguments_threshold", 7 => u64),
diff --git a/tests/ui/doc.rs b/tests/ui/doc.rs
index dde1a471e6e..8935e3f01d5 100644
--- a/tests/ui/doc.rs
+++ b/tests/ui/doc.rs
@@ -174,3 +174,6 @@ fn issue_1920() {}
 /// Not ok: http://www.unicode.org/
 /// Not ok: http://www.unicode.org/reports/tr9/#Reordering_Resolved_Levels
 fn issue_1832() {}
+
+/// Ok: CamelCase (It should not be surrounded by backticks)
+fn issue_2395() {}