Skip to content

Commit 3c3a3be

Browse files
committed
---
yaml --- r: 23670 b: refs/heads/master c: 1397c83 h: refs/heads/master v: v3
1 parent c3fabd9 commit 3c3a3be

File tree

15 files changed

+11
-47
lines changed

15 files changed

+11
-47
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 087c5032a86ad2f2433c6e5f9dcc597ec01de004
2+
refs/heads/master: 1397c83f11c647ba6f9e1362ac551d4454682947
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libstd/arena.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Dynamic arenas.
2-
#[warn(non_camel_case_types)];
32

43
// Arenas are used to quickly allocate objects that share a
54
// lifetime. The arena uses ~[u8] vectors as a backing store to

trunk/src/libstd/base64.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#[forbid(deprecated_mode)];
22
#[forbid(deprecated_pattern)];
3-
#[deny(non_camel_case_types)];
43
import io::Reader;
54

65
trait ToBase64 {

trunk/src/libstd/bitv.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#[deny(non_camel_case_types)];
21
import vec::{to_mut, from_elem};
32

43
export Bitv;

trunk/src/libstd/c_vec.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#[deny(non_camel_case_types)];
21
/*!
32
* Library to interface with chunks of memory allocated in C.
43
*

trunk/src/libstd/cmp.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#[deny(non_camel_case_types)];
21
#[forbid(deprecated_mode)];
32
#[forbid(deprecated_pattern)];
43
/// Additional general-purpose comparison functionality.

trunk/src/libstd/comm.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ Higher level communication abstractions.
88
#[forbid(deprecated_mode)];
99
#[forbid(deprecated_pattern)];
1010

11-
// Make sure we follow the new conventions
12-
#[forbid(non_camel_case_types)];
13-
1411
import pipes::{Channel, Recv, Chan, Port, Selectable};
1512

1613
export DuplexStream;

trunk/src/libstd/dbg.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#[deny(non_camel_case_types)];
21
#[forbid(deprecated_mode)];
32
#[forbid(deprecated_pattern)];
43
//! Unsafe debugging functions for inspecting values.

trunk/src/libstd/deque.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#[deny(non_camel_case_types)];
2-
31
//! A deque. Untested as of yet. Likely buggy
42
53
import option::{Some, None};

trunk/src/libstd/ebml.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#[deny(non_camel_case_types)];
2-
31
// Simple Extensible Binary Markup Language (ebml) reader and writer on a
42
// cursor model. See the specification here:
53
// http://www.matroska.org/technical/specs/rfc/index.html

trunk/src/libstd/fun_treemap.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#[deny(non_camel_case_types)];
21
#[forbid(deprecated_mode)];
32
#[forbid(deprecated_pattern)];
43

trunk/src/libstd/getopts.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#[deny(non_camel_case_types)];
2-
31
/*!
42
* Simple getopt alternative.
53
*

trunk/src/libstd/json.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#[deny(non_camel_case_types)];
2-
31
// Rust JSON serialization library
42
// Copyright (c) 2011 Google Inc.
53

trunk/src/libstd/std.rc

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
#[no_core];
1212

1313
#[allow(vecs_implicitly_copyable)];
14+
// XXX: deny after snapshot
15+
#[warn(non_camel_case_types)];
1416

1517
use core(vers = "0.4");
1618
import core::*;
@@ -30,41 +32,28 @@ export cell;
3032

3133
// General io and system-services modules
3234

33-
#[warn(non_camel_case_types)]
3435
mod net;
35-
#[warn(non_camel_case_types)]
3636
mod net_ip;
37-
#[warn(non_camel_case_types)]
3837
mod net_tcp;
39-
#[warn(non_camel_case_types)]
4038
mod net_url;
4139

4240
// libuv modules
43-
#[warn(non_camel_case_types)]
4441
mod uv;
4542
mod uv_ll;
46-
#[warn(non_camel_case_types)]
4743
mod uv_iotask;
48-
#[warn(non_camel_case_types)]
4944
mod uv_global_loop;
5045

5146

5247
// Utility modules
5348

54-
#[warn(non_camel_case_types)]
5549
mod c_vec;
56-
#[warn(non_camel_case_types)]
5750
mod timer;
58-
#[warn(non_camel_case_types)]
5951
mod cell;
6052

6153
// Concurrency
6254

63-
#[warn(non_camel_case_types)]
6455
mod sync;
65-
#[warn(non_camel_case_types)]
6656
mod arc;
67-
#[warn(non_camel_case_types)]
6857
mod comm;
6958

7059
// Collections
@@ -73,41 +62,32 @@ mod bitv;
7362
mod deque;
7463
mod fun_treemap;
7564
mod list;
65+
#[allow(non_camel_case_types)] // XXX
7666
mod map;
67+
#[allow(non_camel_case_types)] // XXX
7768
mod rope;
69+
#[allow(non_camel_case_types)] // XXX
7870
mod smallintmap;
71+
#[allow(non_camel_case_types)] // XXX
7972
mod sort;
73+
#[allow(non_camel_case_types)] // XXX
8074
mod treemap;
8175

8276
// And ... other stuff
8377

84-
#[warn(non_camel_case_types)]
8578
mod ebml;
86-
#[warn(non_camel_case_types)]
8779
mod dbg;
88-
#[warn(non_camel_case_types)]
8980
mod getopts;
90-
#[warn(non_camel_case_types)]
9181
mod json;
92-
#[warn(non_camel_case_types)]
9382
mod sha1;
94-
#[warn(non_camel_case_types)]
9583
mod md4;
96-
#[warn(non_camel_case_types)]
9784
mod tempfile;
98-
#[warn(non_camel_case_types)]
9985
mod term;
100-
#[warn(non_camel_case_types)]
10186
mod time;
102-
#[warn(non_camel_case_types)]
10387
mod prettyprint;
104-
#[warn(non_camel_case_types)]
10588
mod arena;
106-
#[warn(non_camel_case_types)]
10789
mod par;
108-
#[warn(non_camel_case_types)]
10990
mod cmp;
110-
#[warn(non_camel_case_types)]
11191
mod base64;
11292

11393
#[cfg(unicode)]
@@ -116,7 +96,9 @@ mod unicode;
11696

11797
// Compiler support modules
11898

99+
#[allow(non_camel_case_types)] // XXX
119100
mod test;
101+
#[allow(non_camel_case_types)] // XXX
120102
mod serialization;
121103

122104
// Local Variables:

trunk/src/libstd/uv_ll.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* with per-platform, generated source files from rust-bindgen.
2121
*/
2222

23-
#[allow(non_camel_case_types)] // C types
23+
#[allow(non_camel_case_types)]; // C types
2424

2525
import libc::size_t;
2626
import comm = core::comm;

0 commit comments

Comments
 (0)