---

yaml
---
r: 135759
b: refs/heads/auto
c: 4504412
h: refs/heads/master
i:
  135757: 0c0b776
  135755: c0db778
  135751: 11c1839
  135743: cdc45e1
v: v3

Author: ftxqxd

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 333592edde810324c9730a89372fa5164d10871d
+refs/heads/auto: 45044124e46bbfd1ab9869ffce71259ae93866ff
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/lint/builtin.rs

@@ -871,13 +871,17 @@ impl NonSnakeCase {
         fn to_snake_case(str: &str) -> String {
             let mut words = vec![];
             for s in str.split('_') {
+                let mut last_upper = false;
                 let mut buf = String::new();
                 if s.is_empty() { continue; }
                 for ch in s.chars() {
-                    if !buf.is_empty() && buf.as_slice() != "'" && ch.is_uppercase() {
+                    if !buf.is_empty() && buf.as_slice() != "'"
+                                       && ch.is_uppercase()
+                                       && !last_upper {
                         words.push(buf);
                         buf = String::new();
                     }
+                    last_upper = ch.is_uppercase();
                     buf.push_char(ch.to_lowercase());
                 }
                 words.push(buf);

branches/auto/src/test/compile-fail/lint-non-snake-case-functions.rs

@@ -23,11 +23,14 @@ impl Foo {
 
     pub fn xyZ(&mut self) {}
     //~^ ERROR method `xyZ` should have a snake case name such as `xy_z`
+
+    fn render_HTML() {}
+    //~^ ERROR method `render_HTML` should have a snake case name such as `render_html`
 }
 
 trait X {
     fn ABC();
-    //~^ ERROR trait method `ABC` should have a snake case name such as `a_b_c`
+    //~^ ERROR trait method `ABC` should have a snake case name such as `abc`
 
     fn a_b_C(&self) {}
     //~^ ERROR trait method `a_b_C` should have a snake case name such as `a_b_c`