From f563c0b5257fcb9083ab00a33574f67ea0d051b8 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 17 Sep 2012 18:52:50 -0700
Subject: [PATCH] warn(non_camel_case_types) by default

---
 src/rustc/middle/lint.rs                          | 2 +-
 src/test/compile-fail/lint-heap-memory.rs         | 2 +-
 src/test/compile-fail/lint-managed-heap-memory.rs | 4 ++--
 src/test/compile-fail/lint-owned-heap-memory.rs   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/rustc/middle/lint.rs b/src/rustc/middle/lint.rs
index 255d7a4dd8a8..a10504a987a6 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 cc29e75d64a7..e94322f9cd3d 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 bfefc476e634..16baa73b56a8 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 7c00a3f18b33..d85009fb45ba 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
 }