From 75a97f6b329911387a915f29d34a4e7f1ba8d460 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Mon, 24 Jul 2023 03:29:56 +0100
Subject: [PATCH] chore: remove clippy config file

---
 .github/workflows/ci-post-merge.yml | 5 +++--
 .github/workflows/ci.yml            | 3 ++-
 .prettierrc.yaml                    | 1 -
 .prettierrc.yml                     | 5 +++++
 actix-web-codegen/src/lib.rs        | 2 +-
 clippy.toml                         | 1 -
 6 files changed, 11 insertions(+), 6 deletions(-)
 delete mode 100644 .prettierrc.yaml
 create mode 100644 .prettierrc.yml
 delete mode 100644 clippy.toml

diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml
index d293fea95..06669e31e 100644
--- a/.github/workflows/ci-post-merge.yml
+++ b/.github/workflows/ci-post-merge.yml
@@ -5,7 +5,7 @@ on:
     branches: [master]
 
 permissions:
-  contents: read # to fetch code (actions/checkout)
+  contents: read
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -16,10 +16,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        # prettier-ignore
         target:
           - { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu }
           - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
-          - { name: Windows, os: windows-2022, triple: x86_64-pc-windows-msvc }
+          - { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
         version:
           - nightly
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f85548505..468c9b1df 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
     branches: [master]
 
 permissions:
-  contents: read # to fetch code (actions/checkout)
+  contents: read
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -18,6 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        # prettier-ignore
         target:
           - { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu }
           - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
diff --git a/.prettierrc.yaml b/.prettierrc.yaml
deleted file mode 100644
index 7b5590248..000000000
--- a/.prettierrc.yaml
+++ /dev/null
@@ -1 +0,0 @@
-proseWrap: never
diff --git a/.prettierrc.yml b/.prettierrc.yml
new file mode 100644
index 000000000..b61fd8974
--- /dev/null
+++ b/.prettierrc.yml
@@ -0,0 +1,5 @@
+overrides:
+  - files: '*.md'
+    options:
+      printWidth: 9999
+      proseWrap: never
diff --git a/actix-web-codegen/src/lib.rs b/actix-web-codegen/src/lib.rs
index 6d6f4f79d..6d6c9ab5c 100644
--- a/actix-web-codegen/src/lib.rs
+++ b/actix-web-codegen/src/lib.rs
@@ -221,7 +221,7 @@ pub fn main(_: TokenStream, item: TokenStream) -> TokenStream {
     output
 }
 
-/// Marks async test functions to use the actix system entry-point.
+/// Marks async test functions to use the Actix Web system entry-point.
 ///
 /// # Examples
 /// ```
diff --git a/clippy.toml b/clippy.toml
deleted file mode 100644
index 04371125d..000000000
--- a/clippy.toml
+++ /dev/null
@@ -1 +0,0 @@
-msrv = "1.65"