about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicholas Nethercote <n.nethercote@gmail.com>2024-06-03 16:03:45 +1000
committerNicholas Nethercote <n.nethercote@gmail.com>2024-06-04 09:53:02 +1000
commitd161d06241af26d13ee22bddbfbd4e0e9c562757 (patch)
treeb8c518fba9ca8b3095d62bec2c5a114bf025bb29
parent5875f3fff39055f7e99b891bd18576f4edee4c92 (diff)
downloadrust-d161d06241af26d13ee22bddbfbd4e0e9c562757.tar.gz
rust-d161d06241af26d13ee22bddbfbd4e0e9c562757.zip
rustfmt `tests/run-make-fulldeps/`.
Note: I inserted blank lines between the items in
`pretty-expanded/input.rs` because it looked better that way.
-rw-r--r--rustfmt.toml1
-rw-r--r--tests/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs9
-rw-r--r--tests/run-make-fulldeps/pretty-expanded/input.rs29
3 files changed, 30 insertions, 9 deletions
diff --git a/rustfmt.toml b/rustfmt.toml
index 7cc029d2776..91abd35d748 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -17,7 +17,6 @@ ignore = [
     "/tests/incremental/",            # These tests are somewhat sensitive to source code layout.
     "/tests/pretty/",                 # These tests are very sensitive to source code layout.
     "/tests/run-make/translation/test.rs", # This test contains syntax errors.
-    "/tests/run-make-fulldeps/",
     "/tests/run-pass-valgrind/",
     "/tests/rustdoc/",
     "/tests/rustdoc-gui/",
diff --git a/tests/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs b/tests/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs
index 28a1e27cccc..07466440aab 100644
--- a/tests/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs
+++ b/tests/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs
@@ -27,7 +27,9 @@ use std::any::Any;
 struct TheBackend;
 
 impl CodegenBackend for TheBackend {
-    fn locale_resource(&self) -> &'static str { "" }
+    fn locale_resource(&self) -> &'static str {
+        ""
+    }
 
     fn codegen_crate<'a, 'tcx>(
         &self,
@@ -62,7 +64,10 @@ impl CodegenBackend for TheBackend {
         codegen_results: CodegenResults,
         outputs: &OutputFilenames,
     ) -> Result<(), ErrorGuaranteed> {
-        use rustc_session::{config::{CrateType, OutFileName}, output::out_filename};
+        use rustc_session::{
+            config::{CrateType, OutFileName},
+            output::out_filename,
+        };
         use std::io::Write;
         let crate_name = codegen_results.crate_info.local_crate_name;
         for &crate_type in sess.opts.crate_types.iter() {
diff --git a/tests/run-make-fulldeps/pretty-expanded/input.rs b/tests/run-make-fulldeps/pretty-expanded/input.rs
index 02b235068a1..64ed97572ee 100644
--- a/tests/run-make-fulldeps/pretty-expanded/input.rs
+++ b/tests/run-make-fulldeps/pretty-expanded/input.rs
@@ -1,8 +1,25 @@
 // #13544
 
-#[derive(Debug)] pub struct A;
-#[derive(Debug)] pub struct B(isize);
-#[derive(Debug)] pub struct C { x: isize }
-#[derive(Debug)] pub enum D {}
-#[derive(Debug)] pub enum E { y }
-#[derive(Debug)] pub enum F { z(isize) }
+#[derive(Debug)]
+pub struct A;
+
+#[derive(Debug)]
+pub struct B(isize);
+
+#[derive(Debug)]
+pub struct C {
+    x: isize,
+}
+
+#[derive(Debug)]
+pub enum D {}
+
+#[derive(Debug)]
+pub enum E {
+    y,
+}
+
+#[derive(Debug)]
+pub enum F {
+    z(isize),
+}