Skip to content

Commit d17f9d4

Browse files
committed
---
yaml --- r: 23978 b: refs/heads/master c: f563c0b h: refs/heads/master v: v3
1 parent aa3ef02 commit d17f9d4

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
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: 008bb6fe060e5c2b494d5727e7fe2bb3d38d0494
2+
refs/heads/master: f563c0b5257fcb9083ab00a33574f67ea0d051b8
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/lint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ fn get_lint_dict() -> lint_dict {
157157
(~"non_camel_case_types",
158158
@{lint: non_camel_case_types,
159159
desc: ~"types, variants and traits must have camel case names",
160-
default: allow}),
160+
default: warn}),
161161

162162
(~"managed_heap_memory",
163163
@{lint: managed_heap_memory,

trunk/src/test/compile-fail/lint-heap-memory.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#[forbid(heap_memory)];
22

3-
type foo = { //~ ERROR type uses managed
3+
type Foo = { //~ ERROR type uses managed
44
x: @int
55
};
66

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#[forbid(managed_heap_memory)];
22

3-
type foo = { //~ ERROR type uses managed
3+
type Foo = { //~ ERROR type uses managed
44
x: @int
55
};
66

77
fn main() {
8-
let _x : foo = {x : @10};
8+
let _x : Foo = {x : @10};
99
//~^ ERROR type uses managed
1010
//~^^ ERROR type uses managed
1111
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#[forbid(owned_heap_memory)];
22

3-
type foo = { //~ ERROR type uses owned
3+
type Foo = { //~ ERROR type uses owned
44
x: ~int
55
};
66

77
fn main() {
8-
let _x : foo = {x : ~10};
8+
let _x : Foo = {x : ~10};
99
//~^ ERROR type uses owned
1010
//~^^ ERROR type uses owned
1111
}

0 commit comments

Comments
 (0)