about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Goulet <michael@errs.io>2025-05-12 15:26:28 +0000
committerPietro Albini <pietro@pietroalbini.org>2025-05-13 11:30:39 +0200
commit8ce7783c7cfff1f60134a7754db32ea86855dd89 (patch)
treeea6d406465045786416ac2ba5a8532af3f67b35f
parentce6e29679cbfa08e46b64a5ad78974bbb852ee2b (diff)
downloadrust-8ce7783c7cfff1f60134a7754db32ea86855dd89.tar.gz
rust-8ce7783c7cfff1f60134a7754db32ea86855dd89.zip
Format and skip formatting for pin
-rw-r--r--library/core/src/pin.rs2
-rw-r--r--src/bootstrap/src/core/build_steps/llvm.rs3
2 files changed, 3 insertions, 2 deletions
diff --git a/library/core/src/pin.rs b/library/core/src/pin.rs
index aa8207f8ff4..ecfa723722d 100644
--- a/library/core/src/pin.rs
+++ b/library/core/src/pin.rs
@@ -1936,6 +1936,8 @@ unsafe impl<T: ?Sized> PinCoerceUnsized for *mut T {}
 #[stable(feature = "pin_macro", since = "1.68.0")]
 #[rustc_macro_transparency = "semitransparent"]
 #[allow_internal_unstable(super_let)]
+// `super` gets removed by rustfmt
+#[rustfmt::skip]
 pub macro pin($value:expr $(,)?) {
     {
         super let mut pinned = $value;
diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs
index 33a35372d18..a3788197471 100644
--- a/src/bootstrap/src/core/build_steps/llvm.rs
+++ b/src/bootstrap/src/core/build_steps/llvm.rs
@@ -1230,8 +1230,7 @@ fn supported_sanitizers(
             .iter()
             .map(move |c| SanitizerRuntime {
                 cmake_target: format!("clang_rt.{c}_{os}_dynamic"),
-                path: out_dir
-                    .join(format!("build/lib/darwin/libclang_rt.{c}_{os}_dynamic.dylib")),
+                path: out_dir.join(format!("build/lib/darwin/libclang_rt.{c}_{os}_dynamic.dylib")),
                 name: format!("librustc-{channel}_rt.{c}.dylib"),
             })
             .collect()