From 3793b8fb433645cfdd055413ec9747449db432b0 Mon Sep 17 00:00:00 2001 From: mataha Date: Fri, 14 Jun 2024 16:14:34 +0200 Subject: [PATCH] Fix newlines --- .cargo/config.toml | 3 --- .gitattributes | 9 ++++----- Cargo.toml | 2 +- rustfmt.toml | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 4b40e31f..626e366b 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,6 +1,3 @@ -[alias] -xtask = "run --package xtask --" - # On Windows MSVC, statically link the C runtime so that the resulting EXE does # not depend on the vcruntime DLL. [target.'cfg(all(windows, target_env = "msvc"))'] diff --git a/.gitattributes b/.gitattributes index a9a91a25..eeb6151f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,4 @@ -/contrib/completions/* eol=lf linguist-generated=true text -/contrib/completions/README.md -eol -linguist-generated -text -/init.fish eol=lf text -/templates/*.txt eol=lf text -/zoxide.plugin.zsh eol=lf text +* text=auto eol=lf + +/contrib/completions/** linguist-generated +/contrib/completions/README.md -linguist-generated diff --git a/Cargo.toml b/Cargo.toml index f69f2954..06534cca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ bincode = "1.3.1" clap = { version = "4.3.0", features = ["derive"] } color-print = "0.3.4" dirs = "5.0.0" -dunce = "1.0.4" +dunce = "1.0.1" fastrand = "2.0.0" glob = "0.3.0" ouroboros = "0.18.3" diff --git a/rustfmt.toml b/rustfmt.toml index 024f400b..92a34686 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,6 +1,6 @@ group_imports = "StdExternalCrate" imports_granularity = "Module" -newline_style = "Native" +newline_style = "Unix" use_field_init_shorthand = true use_small_heuristics = "Max" use_try_shorthand = true