From 2dc1354cd0ed52bedc4f7c823e6fa6af581a3109 Mon Sep 17 00:00:00 2001
From: Martin Nordholts <martin.nordholts@codetale.se>
Date: Fri, 5 Sep 2025 19:58:01 +0200
Subject: tests/run-make/crate-loading: Rename source files for clarity

To make the code easier to understand.
---
 tests/run-make/crate-loading/dep-2-reexport.rs          | 10 ++++++++++
 tests/run-make/crate-loading/dependency-1.rs            | 15 +++++++++++++++
 tests/run-make/crate-loading/dependency-2.rs            | 16 ++++++++++++++++
 tests/run-make/crate-loading/multiple-dep-versions-1.rs | 15 ---------------
 tests/run-make/crate-loading/multiple-dep-versions-2.rs | 16 ----------------
 tests/run-make/crate-loading/multiple-dep-versions-3.rs | 10 ----------
 tests/run-make/crate-loading/rmake.rs                   |  9 +++------
 7 files changed, 44 insertions(+), 47 deletions(-)
 create mode 100644 tests/run-make/crate-loading/dep-2-reexport.rs
 create mode 100644 tests/run-make/crate-loading/dependency-1.rs
 create mode 100644 tests/run-make/crate-loading/dependency-2.rs
 delete mode 100644 tests/run-make/crate-loading/multiple-dep-versions-1.rs
 delete mode 100644 tests/run-make/crate-loading/multiple-dep-versions-2.rs
 delete mode 100644 tests/run-make/crate-loading/multiple-dep-versions-3.rs

diff --git a/tests/run-make/crate-loading/dep-2-reexport.rs b/tests/run-make/crate-loading/dep-2-reexport.rs
new file mode 100644
index 00000000000..07444511472
--- /dev/null
+++ b/tests/run-make/crate-loading/dep-2-reexport.rs
@@ -0,0 +1,10 @@
+#![crate_name = "foo"]
+#![crate_type = "rlib"]
+
+extern crate dependency;
+pub use dependency::{Trait2, Type, do_something_trait, do_something_type};
+pub struct OtherType;
+impl dependency::Trait for OtherType {
+    fn foo(&self) {}
+    fn bar() {}
+}
diff --git a/tests/run-make/crate-loading/dependency-1.rs b/tests/run-make/crate-loading/dependency-1.rs
new file mode 100644
index 00000000000..bfeabccf5c1
--- /dev/null
+++ b/tests/run-make/crate-loading/dependency-1.rs
@@ -0,0 +1,15 @@
+#![crate_name = "dependency"]
+#![crate_type = "rlib"]
+pub struct Type(pub i32);
+pub trait Trait {
+    fn foo(&self);
+    fn bar();
+}
+pub trait Trait2 {}
+impl Trait for Type {
+    fn foo(&self) {}
+    fn bar() {}
+}
+pub fn do_something<X: Trait>(_: X) {}
+pub fn do_something_type(_: Type) {}
+pub fn do_something_trait(_: Box<dyn Trait2>) {}
diff --git a/tests/run-make/crate-loading/dependency-2.rs b/tests/run-make/crate-loading/dependency-2.rs
new file mode 100644
index 00000000000..682d1ff64b8
--- /dev/null
+++ b/tests/run-make/crate-loading/dependency-2.rs
@@ -0,0 +1,16 @@
+#![crate_name = "dependency"]
+#![crate_type = "rlib"]
+pub struct Type;
+pub trait Trait {
+    fn foo(&self);
+    fn bar();
+}
+pub trait Trait2 {}
+impl Trait2 for Type {}
+impl Trait for Type {
+    fn foo(&self) {}
+    fn bar() {}
+}
+pub fn do_something<X: Trait>(_: X) {}
+pub fn do_something_type(_: Type) {}
+pub fn do_something_trait(_: Box<dyn Trait2>) {}
diff --git a/tests/run-make/crate-loading/multiple-dep-versions-1.rs b/tests/run-make/crate-loading/multiple-dep-versions-1.rs
deleted file mode 100644
index bfeabccf5c1..00000000000
--- a/tests/run-make/crate-loading/multiple-dep-versions-1.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-#![crate_name = "dependency"]
-#![crate_type = "rlib"]
-pub struct Type(pub i32);
-pub trait Trait {
-    fn foo(&self);
-    fn bar();
-}
-pub trait Trait2 {}
-impl Trait for Type {
-    fn foo(&self) {}
-    fn bar() {}
-}
-pub fn do_something<X: Trait>(_: X) {}
-pub fn do_something_type(_: Type) {}
-pub fn do_something_trait(_: Box<dyn Trait2>) {}
diff --git a/tests/run-make/crate-loading/multiple-dep-versions-2.rs b/tests/run-make/crate-loading/multiple-dep-versions-2.rs
deleted file mode 100644
index 682d1ff64b8..00000000000
--- a/tests/run-make/crate-loading/multiple-dep-versions-2.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-#![crate_name = "dependency"]
-#![crate_type = "rlib"]
-pub struct Type;
-pub trait Trait {
-    fn foo(&self);
-    fn bar();
-}
-pub trait Trait2 {}
-impl Trait2 for Type {}
-impl Trait for Type {
-    fn foo(&self) {}
-    fn bar() {}
-}
-pub fn do_something<X: Trait>(_: X) {}
-pub fn do_something_type(_: Type) {}
-pub fn do_something_trait(_: Box<dyn Trait2>) {}
diff --git a/tests/run-make/crate-loading/multiple-dep-versions-3.rs b/tests/run-make/crate-loading/multiple-dep-versions-3.rs
deleted file mode 100644
index 07444511472..00000000000
--- a/tests/run-make/crate-loading/multiple-dep-versions-3.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#![crate_name = "foo"]
-#![crate_type = "rlib"]
-
-extern crate dependency;
-pub use dependency::{Trait2, Type, do_something_trait, do_something_type};
-pub struct OtherType;
-impl dependency::Trait for OtherType {
-    fn foo(&self) {}
-    fn bar() {}
-}
diff --git a/tests/run-make/crate-loading/rmake.rs b/tests/run-make/crate-loading/rmake.rs
index 6ad456e3e3e..8f257786123 100644
--- a/tests/run-make/crate-loading/rmake.rs
+++ b/tests/run-make/crate-loading/rmake.rs
@@ -6,12 +6,9 @@
 use run_make_support::{diff, rust_lib_name, rustc};
 
 fn main() {
-    rustc().input("multiple-dep-versions-1.rs").run();
-    rustc().input("multiple-dep-versions-2.rs").extra_filename("2").metadata("2").run();
-    rustc()
-        .input("multiple-dep-versions-3.rs")
-        .extern_("dependency", rust_lib_name("dependency2"))
-        .run();
+    rustc().input("dependency-1.rs").run();
+    rustc().input("dependency-2.rs").extra_filename("2").metadata("2").run();
+    rustc().input("dep-2-reexport.rs").extern_("dependency", rust_lib_name("dependency2")).run();
 
     let out = rustc()
         .input("multiple-dep-versions.rs")
-- 
cgit 1.4.1-3-g733a5