---

yaml
---
r: 135387
b: refs/heads/snap-stage3
c: 4504412
h: refs/heads/master
i:
  135385: 098e751
  135383: b9b8b4b
v: v3

Author: ftxqxd

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 74090504219e4e37c1a6d9fdd8600f44b51c7b04
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 333592edde810324c9730a89372fa5164d10871d
+refs/heads/snap-stage3: 45044124e46bbfd1ab9869ffce71259ae93866ff
 refs/heads/try: 14378ea357c06c23607ca61ade44f60a7a64a1c7
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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/snap-stage3/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`