warn(non_camel_case_types) by default

4 files changed, 6 insertions, 6 deletions

diff --git a/src/rustc/middle/lint.rs b/src/rustc/middle/lint.rs
index 255d7a4dd8a..a10504a987a 100644
--- a/src/rustc/middle/lint.rs
+++ b/src/rustc/middle/lint.rs
@@ -157,7 +157,7 @@ fn get_lint_dict() -> lint_dict {
         (~"non_camel_case_types",
          @{lint: non_camel_case_types,
            desc: ~"types, variants and traits must have camel case names",
-           default: allow}),
+           default: warn}),
 
         (~"managed_heap_memory",
          @{lint: managed_heap_memory,
diff --git a/src/test/compile-fail/lint-heap-memory.rs b/src/test/compile-fail/lint-heap-memory.rs
index cc29e75d64a..e94322f9cd3 100644
--- a/src/test/compile-fail/lint-heap-memory.rs
+++ b/src/test/compile-fail/lint-heap-memory.rs
@@ -1,6 +1,6 @@
 #[forbid(heap_memory)];
 
-type foo = { //~ ERROR type uses managed
+type Foo = { //~ ERROR type uses managed
     x: @int
 };
 
diff --git a/src/test/compile-fail/lint-managed-heap-memory.rs b/src/test/compile-fail/lint-managed-heap-memory.rs
index bfefc476e63..16baa73b56a 100644
--- a/src/test/compile-fail/lint-managed-heap-memory.rs
+++ b/src/test/compile-fail/lint-managed-heap-memory.rs
@@ -1,11 +1,11 @@
 #[forbid(managed_heap_memory)];
 
-type foo = { //~ ERROR type uses managed
+type Foo = { //~ ERROR type uses managed
     x: @int
 };
 
 fn main() {
-    let _x : foo = {x : @10};
+    let _x : Foo = {x : @10};
     //~^ ERROR type uses managed
     //~^^ ERROR type uses managed
 }
diff --git a/src/test/compile-fail/lint-owned-heap-memory.rs b/src/test/compile-fail/lint-owned-heap-memory.rs
index 7c00a3f18b3..d85009fb45b 100644
--- a/src/test/compile-fail/lint-owned-heap-memory.rs
+++ b/src/test/compile-fail/lint-owned-heap-memory.rs
@@ -1,11 +1,11 @@
 #[forbid(owned_heap_memory)];
 
-type foo = { //~ ERROR type uses owned
+type Foo = { //~ ERROR type uses owned
     x: ~int
 };
 
 fn main() {
-    let _x : foo = {x : ~10};
+    let _x : Foo = {x : ~10};
     //~^ ERROR type uses owned
     //~^^ ERROR type uses owned
 }