mirror of
https://github.com/NotAShelf/nyxexprs.git
synced 2025-11-21 04:54:12 +00:00
alejandra-custom: rebase patches; re-add spaced-elements patch
This commit is contained in:
parent
0e360fa999
commit
b6209c17d5
3 changed files with 480 additions and 16 deletions
|
|
@ -1,14 +1,14 @@
|
|||
diff --git a/src/alejandra_cli/src/cli.rs b/src/alejandra_cli/src/cli.rs
|
||||
diff --git i/src/alejandra_cli/src/cli.rs w/src/alejandra_cli/src/cli.rs
|
||||
index bab102c..b90bf1d 100644
|
||||
--- a/src/alejandra_cli/src/cli.rs
|
||||
+++ b/src/alejandra_cli/src/cli.rs
|
||||
--- i/src/alejandra_cli/src/cli.rs
|
||||
+++ w/src/alejandra_cli/src/cli.rs
|
||||
@@ -7,7 +7,6 @@ use futures::future::RemoteHandle;
|
||||
use futures::stream::FuturesUnordered;
|
||||
use futures::task::SpawnExt;
|
||||
|
||||
|
||||
-use crate::ads::random_ad;
|
||||
use crate::verbosity::Verbosity;
|
||||
|
||||
|
||||
/// The Uncompromising Nix Code Formatter.
|
||||
@@ -203,11 +202,6 @@ pub fn main() -> std::io::Result<()> {
|
||||
(true, false) => "requires formatting",
|
||||
|
|
@ -20,7 +20,7 @@ index bab102c..b90bf1d 100644
|
|||
- eprint!("{}", random_ad());
|
||||
- }
|
||||
}
|
||||
|
||||
|
||||
std::process::exit(if in_place { 0 } else { 2 });
|
||||
@@ -218,8 +212,6 @@ pub fn main() -> std::io::Result<()> {
|
||||
eprintln!(
|
||||
|
|
@ -29,16 +29,14 @@ index bab102c..b90bf1d 100644
|
|||
- eprintln!();
|
||||
- eprint!("{}", random_ad());
|
||||
}
|
||||
|
||||
|
||||
std::process::exit(0);
|
||||
diff --git a/src/alejandra_cli/src/lib.rs b/src/alejandra_cli/src/lib.rs
|
||||
diff --git i/src/alejandra_cli/src/lib.rs w/src/alejandra_cli/src/lib.rs
|
||||
index fd49ce8..258f656 100644
|
||||
--- a/src/alejandra_cli/src/lib.rs
|
||||
+++ b/src/alejandra_cli/src/lib.rs
|
||||
--- i/src/alejandra_cli/src/lib.rs
|
||||
+++ w/src/alejandra_cli/src/lib.rs
|
||||
@@ -1,4 +1,3 @@
|
||||
-mod ads;
|
||||
pub mod cli;
|
||||
mod find;
|
||||
mod verbosity;
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue