Merge pull request #6193 from ytmimi/subtree-push-nightly-2024-06-13

subtree-push nightly-2024-06-13

2 files changed, 29 insertions, 3 deletions

diff --git a/src/test/mod.rs b/src/test/mod.rs
index d567a1b8e4e..7c563801c32 100644
--- a/src/test/mod.rs
+++ b/src/test/mod.rs
@@ -391,12 +391,24 @@ fn self_tests() {
         files.push(path);
     }
     // for crates that need to be included but lies outside src
-    let external_crates = vec!["check_diff"];
+    let external_crates = vec!["check_diff", "config_proc_macro"];
     for external_crate in external_crates {
         let mut path = PathBuf::from(external_crate);
         path.push("src");
-        path.push("main.rs");
-        files.push(path);
+        let directory = fs::read_dir(&path).unwrap();
+        let search_files = directory.filter_map(|file| {
+            file.ok().and_then(|f| {
+                let name = f.file_name();
+                if matches!(name.as_os_str().to_str(), Some("main.rs" | "lib.rs")) {
+                    Some(f.path())
+                } else {
+                    None
+                }
+            })
+        });
+        for file in search_files {
+            files.push(file);
+        }
     }
     files.push(PathBuf::from("src/lib.rs"));
 
diff --git a/src/test/parser.rs b/src/test/parser.rs
index ae4a4f94d92..d951c8469e6 100644
--- a/src/test/parser.rs
+++ b/src/test/parser.rs
@@ -55,3 +55,17 @@ fn crate_parsing_errors_on_unclosed_delims() {
     let filename = "tests/parser/unclosed-delims/issue_4466.rs";
     assert_parser_error(filename);
 }
+
+#[test]
+fn crate_parsing_stashed_diag() {
+    // See also https://github.com/rust-lang/rust/issues/121450
+    let filename = "tests/parser/stashed-diag.rs";
+    assert_parser_error(filename);
+}
+
+#[test]
+fn crate_parsing_stashed_diag2() {
+    // See also https://github.com/rust-lang/rust/issues/121517
+    let filename = "tests/parser/stashed-diag2.rs";
+    assert_parser_error(filename);
+}