From 6eb00a41a0850e10e6a12021332a147dd97578a5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 6 Apr 2022 11:03:07 +0300
Subject: [PATCH] rustfmt: actually fix the failing test

It only runs on nightly, but the next commits will show
why this is useful.
---
 .../compilers/rust/rustfmt-fix-self-tests.patch     | 13 +++++++++++++
 pkgs/development/compilers/rust/rustfmt.nix         |  3 +++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/compilers/rust/rustfmt-fix-self-tests.patch

diff --git a/pkgs/development/compilers/rust/rustfmt-fix-self-tests.patch b/pkgs/development/compilers/rust/rustfmt-fix-self-tests.patch
new file mode 100644
index 000000000000..b60332daef44
--- /dev/null
+++ b/pkgs/development/compilers/rust/rustfmt-fix-self-tests.patch
@@ -0,0 +1,13 @@
+--- a/src/tools/rustfmt/src/ignore_path.rs
++++ b/src/tools/rustfmt/src/ignore_path.rs
+@@ -37,9 +37,9 @@
+     #[nightly_only_test]
+     #[test]
+     fn test_ignore_path_set() {
+-        use std::path::{Path, PathBuf};
+         use crate::config::{Config, FileName};
+         use crate::ignore_path::IgnorePathSet;
++        use std::path::{Path, PathBuf};
+ 
+         let config =
+             Config::from_toml(r#"ignore = ["foo.rs", "bar_dir/*"]"#, Path::new("")).unwrap();
diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix
index f8ac8bf39df3..9922d60ef705 100644
--- a/pkgs/development/compilers/rust/rustfmt.nix
+++ b/pkgs/development/compilers/rust/rustfmt.nix
@@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec {
   CFG_RELEASE = rustPlatform.rust.rustc.version;
   CFG_RELEASE_CHANNEL = "stable";
 
+  # FIXME: seems fixed upstream, remove after the next update
+  patches = [ ./rustfmt-fix-self-tests.patch ];
+
   meta = with lib; {
     description = "A tool for formatting Rust code according to style guidelines";
     homepage = "https://github.com/rust-lang-nursery/rustfmt";