diff options
| author | bors <bors@rust-lang.org> | 2024-02-26 08:02:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-26 08:02:40 +0000 |
| commit | 7cadf0b2da0d83d5d38c8eddb033acf1508942e0 (patch) | |
| tree | 0cc9d713cfbed1a362010c110d1ba7f421ec2f07 /src/tools/rustfmt | |
| parent | 8d74063672a9b1eb283e685cd059187f86d9373d (diff) | |
| parent | db0b49b945f56356ee495cd8b909545d566ef92e (diff) | |
| download | rust-7cadf0b2da0d83d5d38c8eddb033acf1508942e0.tar.gz rust-7cadf0b2da0d83d5d38c8eddb033acf1508942e0.zip | |
Auto merge of #3326 - rust-lang:rustup-2024-02-26, r=RalfJung
Automatic Rustup also fixes https://github.com/rust-lang/miri/issues/3308
Diffstat (limited to 'src/tools/rustfmt')
| -rw-r--r-- | src/tools/rustfmt/src/source_file.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/rustfmt/src/source_file.rs b/src/tools/rustfmt/src/source_file.rs index 958f9b0154f..512a8593c27 100644 --- a/src/tools/rustfmt/src/source_file.rs +++ b/src/tools/rustfmt/src/source_file.rs @@ -66,6 +66,7 @@ where } } + #[cfg_attr(not(bootstrap), allow(non_local_definitions))] impl From<&FileName> for rustc_span::FileName { fn from(filename: &FileName) -> rustc_span::FileName { match filename { |