---

yaml
---
r: 30270
b: refs/heads/incoming
c: 1397c83
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 087c5032a86ad2f2433c6e5f9dcc597ec01de004
+refs/heads/incoming: 1397c83f11c647ba6f9e1362ac551d4454682947
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libstd/arena.rs

@@ -1,5 +1,4 @@
 // Dynamic arenas.
-#[warn(non_camel_case_types)];
 
 // Arenas are used to quickly allocate objects that share a
 // lifetime. The arena uses ~[u8] vectors as a backing store to

branches/incoming/src/libstd/base64.rs

@@ -1,6 +1,5 @@
 #[forbid(deprecated_mode)];
 #[forbid(deprecated_pattern)];
-#[deny(non_camel_case_types)];
 import io::Reader;
 
 trait ToBase64 {

branches/incoming/src/libstd/bitv.rs

@@ -1,4 +1,3 @@
-#[deny(non_camel_case_types)];
 import vec::{to_mut, from_elem};
 
 export Bitv;

branches/incoming/src/libstd/c_vec.rs

@@ -1,4 +1,3 @@
-#[deny(non_camel_case_types)];
 /*!
  * Library to interface with chunks of memory allocated in C.
  *

branches/incoming/src/libstd/cmp.rs

@@ -1,4 +1,3 @@
-#[deny(non_camel_case_types)];
 #[forbid(deprecated_mode)];
 #[forbid(deprecated_pattern)];
 /// Additional general-purpose comparison functionality.

branches/incoming/src/libstd/comm.rs

@@ -8,9 +8,6 @@ Higher level communication abstractions.
 #[forbid(deprecated_mode)];
 #[forbid(deprecated_pattern)];
 
-// Make sure we follow the new conventions
-#[forbid(non_camel_case_types)];
-
 import pipes::{Channel, Recv, Chan, Port, Selectable};
 
 export DuplexStream;

branches/incoming/src/libstd/dbg.rs

@@ -1,4 +1,3 @@
-#[deny(non_camel_case_types)];
 #[forbid(deprecated_mode)];
 #[forbid(deprecated_pattern)];
 //! Unsafe debugging functions for inspecting values.

branches/incoming/src/libstd/deque.rs

@@ -1,5 +1,3 @@
-#[deny(non_camel_case_types)];
-
 //! A deque. Untested as of yet. Likely buggy
 
 import option::{Some, None};

branches/incoming/src/libstd/ebml.rs

@@ -1,5 +1,3 @@
-#[deny(non_camel_case_types)];
-
 // Simple Extensible Binary Markup Language (ebml) reader and writer on a
 // cursor model. See the specification here:
 //     http://www.matroska.org/technical/specs/rfc/index.html

branches/incoming/src/libstd/fun_treemap.rs

@@ -1,4 +1,3 @@
-#[deny(non_camel_case_types)];
 #[forbid(deprecated_mode)];
 #[forbid(deprecated_pattern)];
 

branches/incoming/src/libstd/getopts.rs

@@ -1,5 +1,3 @@
-#[deny(non_camel_case_types)];
-
 /*!
  * Simple getopt alternative.
  *

branches/incoming/src/libstd/json.rs

@@ -1,5 +1,3 @@
-#[deny(non_camel_case_types)];
-
 // Rust JSON serialization library
 // Copyright (c) 2011 Google Inc.
 

branches/incoming/src/libstd/std.rc

@@ -11,6 +11,8 @@
 #[no_core];
 
 #[allow(vecs_implicitly_copyable)];
+// XXX: deny after snapshot
+#[warn(non_camel_case_types)];
 
 use core(vers = "0.4");
 import core::*;
@@ -30,41 +32,28 @@ export cell;
 
 // General io and system-services modules
 
-#[warn(non_camel_case_types)]
 mod net;
-#[warn(non_camel_case_types)]
 mod net_ip;
-#[warn(non_camel_case_types)]
 mod net_tcp;
-#[warn(non_camel_case_types)]
 mod net_url;
 
 // libuv modules
-#[warn(non_camel_case_types)]
 mod uv;
 mod uv_ll;
-#[warn(non_camel_case_types)]
 mod uv_iotask;
-#[warn(non_camel_case_types)]
 mod uv_global_loop;
 
 
 // Utility modules
 
-#[warn(non_camel_case_types)]
 mod c_vec;
-#[warn(non_camel_case_types)]
 mod timer;
-#[warn(non_camel_case_types)]
 mod cell;
 
 // Concurrency
 
-#[warn(non_camel_case_types)]
 mod sync;
-#[warn(non_camel_case_types)]
 mod arc;
-#[warn(non_camel_case_types)]
 mod comm;
 
 // Collections
@@ -73,41 +62,32 @@ mod bitv;
 mod deque;
 mod fun_treemap;
 mod list;
+#[allow(non_camel_case_types)] // XXX
 mod map;
+#[allow(non_camel_case_types)] // XXX
 mod rope;
+#[allow(non_camel_case_types)] // XXX
 mod smallintmap;
+#[allow(non_camel_case_types)] // XXX
 mod sort;
+#[allow(non_camel_case_types)] // XXX
 mod treemap;
 
 // And ... other stuff
 
-#[warn(non_camel_case_types)]
 mod ebml;
-#[warn(non_camel_case_types)]
 mod dbg;
-#[warn(non_camel_case_types)]
 mod getopts;
-#[warn(non_camel_case_types)]
 mod json;
-#[warn(non_camel_case_types)]
 mod sha1;
-#[warn(non_camel_case_types)]
 mod md4;
-#[warn(non_camel_case_types)]
 mod tempfile;
-#[warn(non_camel_case_types)]
 mod term;
-#[warn(non_camel_case_types)]
 mod time;
-#[warn(non_camel_case_types)]
 mod prettyprint;
-#[warn(non_camel_case_types)]
 mod arena;
-#[warn(non_camel_case_types)]
 mod par;
-#[warn(non_camel_case_types)]
 mod cmp;
-#[warn(non_camel_case_types)]
 mod base64;
 
 #[cfg(unicode)]
@@ -116,7 +96,9 @@ mod unicode;
 
 // Compiler support modules
 
+#[allow(non_camel_case_types)] // XXX
 mod test;
+#[allow(non_camel_case_types)] // XXX
 mod serialization;
 
 // Local Variables:

branches/incoming/src/libstd/uv_ll.rs

@@ -20,7 +20,7 @@
  * with per-platform, generated source files from rust-bindgen.
  */
 
-#[allow(non_camel_case_types)] // C types
+#[allow(non_camel_case_types)]; // C types
 
 import libc::size_t;
 import comm = core::comm;