Skip to content

Commit 8760350

Browse files
committed
---
yaml --- r: 23674 b: refs/heads/master c: 117aa8c h: refs/heads/master v: v3
1 parent 90eb0e7 commit 8760350

File tree

8 files changed

+10
-56
lines changed

8 files changed

+10
-56
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: a80b7dc709ff03e569ef22e322925c93d3a415f5
2+
refs/heads/master: 117aa8cfeebb9973476814ef856ff0176fa835ef
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/core.rc

Lines changed: 2 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
#[no_core];
3333

3434
#[deny(vecs_implicitly_copyable)];
35+
// XXX: Switch to deny after snapshot
36+
#[warn(non_camel_case_types)];
3537

3638
export int, i8, i16, i32, i64;
3739
export uint, u8, u16, u32, u64;
@@ -71,7 +73,6 @@ export priv;
7173
// Built-in-type support modules
7274

7375
/// Operations and constants for `int`
74-
#[warn(non_camel_case_types)]
7576
#[path = "int-template"]
7677
mod int {
7778
import inst::{ hash, pow };
@@ -81,39 +82,34 @@ mod int {
8182
}
8283

8384
/// Operations and constants for `i8`
84-
#[warn(non_camel_case_types)]
8585
#[path = "int-template"]
8686
mod i8 {
8787
#[path = "i8.rs"]
8888
mod inst;
8989
}
9090

9191
/// Operations and constants for `i16`
92-
#[warn(non_camel_case_types)]
9392
#[path = "int-template"]
9493
mod i16 {
9594
#[path = "i16.rs"]
9695
mod inst;
9796
}
9897

9998
/// Operations and constants for `i32`
100-
#[warn(non_camel_case_types)]
10199
#[path = "int-template"]
102100
mod i32 {
103101
#[path = "i32.rs"]
104102
mod inst;
105103
}
106104

107105
/// Operations and constants for `i64`
108-
#[warn(non_camel_case_types)]
109106
#[path = "int-template"]
110107
mod i64 {
111108
#[path = "i64.rs"]
112109
mod inst;
113110
}
114111

115112
/// Operations and constants for `uint`
116-
#[warn(non_camel_case_types)]
117113
#[path = "uint-template"]
118114
mod uint {
119115
import inst::{
@@ -128,7 +124,6 @@ mod uint {
128124
}
129125

130126
/// Operations and constants for `u8`
131-
#[warn(non_camel_case_types)]
132127
#[path = "uint-template"]
133128
mod u8 {
134129
import inst::is_ascii;
@@ -139,72 +134,50 @@ mod u8 {
139134
}
140135

141136
/// Operations and constants for `u16`
142-
#[warn(non_camel_case_types)]
143137
#[path = "uint-template"]
144138
mod u16 {
145139
#[path = "u16.rs"]
146140
mod inst;
147141
}
148142

149143
/// Operations and constants for `u32`
150-
#[warn(non_camel_case_types)]
151144
#[path = "uint-template"]
152145
mod u32 {
153146
#[path = "u32.rs"]
154147
mod inst;
155148
}
156149

157150
/// Operations and constants for `u64`
158-
#[warn(non_camel_case_types)]
159151
#[path = "uint-template"]
160152
mod u64 {
161153
#[path = "u64.rs"]
162154
mod inst;
163155
}
164156

165157

166-
#[warn(non_camel_case_types)]
167158
mod box;
168-
#[warn(non_camel_case_types)]
169159
mod char;
170-
#[warn(non_camel_case_types)]
171160
mod float;
172-
#[warn(non_camel_case_types)]
173161
mod f32;
174-
#[warn(non_camel_case_types)]
175162
mod f64;
176-
#[warn(non_camel_case_types)]
177163
mod str;
178-
#[warn(non_camel_case_types)]
179164
mod ptr;
180-
#[warn(non_camel_case_types)]
181165
mod vec;
182-
#[warn(non_camel_case_types)]
183166
mod at_vec;
184-
#[warn(non_camel_case_types)]
185167
mod bool;
186-
#[warn(non_camel_case_types)]
187168
mod tuple;
188-
#[warn(non_camel_case_types)]
189169
mod unit;
190-
#[warn(non_camel_case_types)]
191170
mod uniq;
192171

193172
// Ubiquitous-utility-type modules
194173

195174
#[cfg(notest)]
196175
mod ops;
197-
#[warn(non_camel_case_types)]
198176
mod cmp;
199-
#[warn(non_camel_case_types)]
200177
mod num;
201-
#[warn(non_camel_case_types)]
202178
mod hash;
203-
#[warn(non_camel_case_types)]
204179
mod either;
205-
#[warn(non_camel_case_types)]
206180
mod iter;
207-
#[warn(non_camel_case_types)]
208181
mod logging;
209182
mod option;
210183
#[path="iter-trait"]
@@ -213,60 +186,41 @@ mod option_iter {
213186
mod inst;
214187
}
215188
mod result;
216-
#[warn(non_camel_case_types)]
217189
mod to_str;
218-
#[warn(non_camel_case_types)]
219190
mod to_bytes;
220-
#[warn(non_camel_case_types)]
221191
mod util;
222192

223193
// Data structure modules
224194

225-
#[warn(non_camel_case_types)]
226195
mod dvec;
227196
#[path="iter-trait"]
228-
#[warn(non_camel_case_types)]
229197
mod dvec_iter {
230198
#[path = "dvec.rs"]
231199
mod inst;
232200
}
233-
#[warn(non_camel_case_types)]
234201
mod dlist;
235202
#[path="iter-trait"]
236-
#[warn(non_camel_case_types)]
237203
mod dlist_iter {
238204
#[path ="dlist.rs"]
239205
mod inst;
240206
}
241-
#[warn(non_camel_case_types)]
242207
mod send_map;
243208

244209
// Concurrency
245-
#[warn(non_camel_case_types)]
246210
mod comm;
247-
#[warn(non_camel_case_types)]
248211
mod task;
249-
//#[warn(non_camel_ase_types)] pipec code continues to trip this warning
250212
mod future;
251-
#[warn(non_camel_case_types)]
252213
mod pipes;
253214

254215
// Runtime and language-primitive support
255216

256-
#[warn(non_camel_case_types)]
257217
mod io;
258218
mod libc;
259-
#[warn(non_camel_case_types)]
260219
mod os;
261-
#[warn(non_camel_case_types)]
262220
mod path;
263-
#[warn(non_camel_case_types)]
264221
mod rand;
265-
#[warn(non_camel_case_types)]
266222
mod run;
267-
#[warn(non_camel_case_types)]
268223
mod sys;
269-
#[warn(non_camel_case_types)]
270224
mod unsafe;
271225

272226
mod managed;
@@ -284,13 +238,9 @@ mod rt;
284238

285239
// For internal use, not exported
286240

287-
#[warn(non_camel_case_types)]
288241
mod unicode;
289-
#[warn(non_camel_case_types)]
290242
mod priv;
291-
#[warn(non_camel_case_types)]
292243
mod cmath;
293-
#[warn(non_camel_case_types)]
294244
mod stackwalk;
295245

296246
// Local Variables:

trunk/src/libcore/extfmt.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#[doc(hidden)];
2+
#[allow(non_camel_case_types)];
23

34
/*
45
Syntax Extension: fmt

trunk/src/libcore/iter-trait/option.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#[allow(non_camel_case_types)]
12
type IMPL_T<A> = Option<A>;
23

34
pure fn EACH<A>(self: IMPL_T<A>, f: fn(A) -> bool) {

trunk/src/libcore/managed.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ mutation when the data structure should be immutable.
99
1010
*/
1111

12-
#[forbid(non_camel_case_types)];
1312
#[forbid(deprecated_mode)];
1413
#[forbid(deprecated_pattern)];
1514

trunk/src/libcore/ops.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// Core operators and kinds.
22

3+
#[allow(non_camel_case_types)];
4+
35
#[cfg(notest)]
46
#[lang="const"]
57
trait const {

trunk/src/libcore/option.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,14 +290,14 @@ fn test_unwrap_str() {
290290

291291
#[test]
292292
fn test_unwrap_resource() {
293-
struct r {
293+
struct R {
294294
let i: @mut int;
295295
new(i: @mut int) { self.i = i; }
296296
drop { *(self.i) += 1; }
297297
}
298298
let i = @mut 0;
299299
{
300-
let x = r(i);
300+
let x = R(i);
301301
let opt = Some(x);
302302
let _y = unwrap(opt);
303303
}

trunk/src/libcore/rt.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import libc::c_void;
88
import libc::size_t;
99
import libc::uintptr_t;
1010

11+
#[allow(non_camel_case_types)]
1112
type rust_task = c_void;
1213

1314
extern mod rustrt {

0 commit comments

Comments
 (0)