Merge branch 'master' into actions-ci

cli/src/tests/corpus_test.rs

@@ -390,7 +390,7 @@ fn flatten_tests(test: TestEntry) -> Vec<(String, Vec<u8>, String, bool)> {
                 }
                 result.push((name, input, output, has_fields));
             }
-            TestEntry::Group { mut name, children } => {
+            TestEntry::Group { mut name, children, .. } => {
                 if !prefix.is_empty() {
                     name.insert_str(0, " - ");
                     name.insert_str(0, prefix);

cli/src/tests/tags_test.rs

@@ -70,7 +70,7 @@ const RUBY_TAG_QUERY: &'static str = r#"
 (method
     name: (_) @name) @definition.method
 
-(method_call
+(call
     method: (identifier) @name) @reference.call
 
 (setter (identifier) @ignore)
@@ -317,19 +317,17 @@ fn test_tags_with_parse_error() {
     assert!(failed, "syntax error should have been detected");
 
     assert_eq!(
-        newtags.iter()
+        newtags
+            .iter()
             .map(|t| (
                 substr(source, &t.name_range),
                 tags_config.syntax_type_name(t.syntax_type_id)
             ))
             .collect::<Vec<_>>(),
-        &[
-            ("Fine", "class"),
-        ]
+        &[("Fine", "class"),]
     );
 }
 
-
 #[test]
 fn test_tags_via_c_api() {
     allocations::record(|| {