Make incorrect case diagnostic work inside of functions

Author: popzxc

crates/hir_def/src/item_scope.rs

@@ -95,6 +95,12 @@ impl ItemScope {
         self.impls.iter().copied()
     }
 
+    pub fn values(
+        &self,
+    ) -> impl Iterator<Item = (ModuleDefId, Visibility)> + ExactSizeIterator + '_ {
+        self.values.values().copied()
+    }
+
     pub fn visibility_of(&self, def: ModuleDefId) -> Option<Visibility> {
         self.name_of(ItemInNs::Types(def))
             .or_else(|| self.name_of(ItemInNs::Values(def)))

crates/hir_ty/src/diagnostics.rs

@@ -281,7 +281,7 @@ impl Diagnostic for IncorrectCase {
 
     fn message(&self) -> String {
         format!(
-            "{} `{}` should have a {} name, e.g. `{}`",
+            "{} `{}` should have {} name, e.g. `{}`",
             self.ident_type,
             self.ident_text,
             self.expected_case.to_string(),
@@ -339,6 +339,8 @@ mod tests {
                         let impl_data = self.impl_data(impl_id);
                         for item in impl_data.items.iter() {
                             if let AssocItemId::FunctionId(f) = item {
+                                let mut sink = DiagnosticSinkBuilder::new().build(&mut cb);
+                                validate_module_item(self, ModuleDefId::FunctionId(*f), &mut sink);
                                 fns.push(*f)
                             }
                         }