about summary refs log tree commit diff
path: root/src/libunicode
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-10-30 09:02:07 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-10-30 17:37:22 -0700
commit00975e041d42b89b14b2655b2891e3348f3ad3f1 (patch)
tree4300bbf758c3c1438ca807ef0ca8326b373a4e00 /src/libunicode
parentf68dafa5059b84b6102dfd7b1e1cee9aae86b220 (diff)
parentd9eb13b2c8397f6eccea0c37967c4010d9aedb0d (diff)
downloadrust-00975e041d42b89b14b2655b2891e3348f3ad3f1.tar.gz
rust-00975e041d42b89b14b2655b2891e3348f3ad3f1.zip
rollup merge of #18398 : aturon/lint-conventions-2
Conflicts:
	src/libcollections/slice.rs
	src/libcore/failure.rs
	src/libsyntax/parse/token.rs
	src/test/debuginfo/basic-types-mut-globals.rs
	src/test/debuginfo/simple-struct.rs
	src/test/debuginfo/trait-pointers.rs
Diffstat (limited to 'src/libunicode')
-rw-r--r--src/libunicode/tables.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libunicode/tables.rs b/src/libunicode/tables.rs
index 3f15abcad6d..5fe91a87056 100644
--- a/src/libunicode/tables.rs
+++ b/src/libunicode/tables.rs
@@ -10,7 +10,7 @@
 
 // NOTE: The following code was generated by "src/etc/unicode.py", do not edit directly
 
-#![allow(missing_doc, non_uppercase_statics, non_snake_case)]
+#![allow(missing_docs, non_upper_case_globals, non_snake_case)]
 
 /// The version of [Unicode](http://www.unicode.org/)
 /// that the `UnicodeChar` and `UnicodeStrSlice` traits are based on.