Revert "rustfmt: actually fix the failing test"
This reverts commit 6eb00a41a0
.
fixed in 1.60.0
This commit is contained in:
parent
a5aa12b446
commit
61970a41ec
@ -1,13 +0,0 @@
|
||||
--- 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();
|
@ -21,9 +21,6 @@ rustPlatform.buildRustPackage rec {
|
||||
CFG_RELEASE = rustPlatform.rust.rustc.version;
|
||||
CFG_RELEASE_CHANNEL = if asNightly then "nightly" else "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";
|
||||
|
Loading…
Reference in New Issue
Block a user