From 20936d87003f587e059c5c2f418f7cfc096ded11 Mon Sep 17 00:00:00 2001
From: Chris Green <greenc@fnal.gov>
Date: Tue, 28 Nov 2023 20:58:41 -0600
Subject: [PATCH] Style fixes: flake8

---
 bin/spack                                      |  2 +-
 .../repos/builtin/packages/catch2/package.py   | 18 ------------------
 .../repos/builtin/packages/protobuf/package.py | 10 ++++------
 .../repos/builtin/packages/rust/package.py     |  6 +++---
 4 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/bin/spack b/bin/spack
index 7f3d704b912d6f..14c26ae2b397ac 100755
--- a/bin/spack
+++ b/bin/spack
@@ -1,5 +1,5 @@
 #!/usr/bin/python3 -I
-#!/bin/sh
+# #!/bin/sh
 # -*- python -*-
 #
 # Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
diff --git a/var/spack/repos/builtin/packages/catch2/package.py b/var/spack/repos/builtin/packages/catch2/package.py
index 167e9e15b10968..d3b661ef8cbf19 100644
--- a/var/spack/repos/builtin/packages/catch2/package.py
+++ b/var/spack/repos/builtin/packages/catch2/package.py
@@ -17,7 +17,6 @@ class Catch2(CMakePackage):
     maintainers("ax3l", "greenc-FNAL")
 
     # In-Development
-
     version("develop", branch="devel")
 
     # Releases
@@ -121,23 +120,6 @@ class Catch2(CMakePackage):
     )
     variant("shared", when="@3:", default=False, description="Build shared library")
 
-    def patch(self):
-        filter_file(
-            r"#include <vector>",
-            "#include <vector>\n#include <cstdint>",
-            "src/catch2/internal/catch_string_manip.hpp",
-        )
-        filter_file(
-            r"#include <vector>",
-            "#include <vector>\n#include <cstdint>",
-            "src/catch2/internal/catch_xmlwriter.hpp",
-        )
-        filter_file(
-            r"#include <vector>",
-            "#include <vector>\n#include <cstdint>",
-            "src/catch2/catch_test_case_info.hpp",
-        )
-
     def patch(self):
         filter_file(
             r"#include \<catch2",
diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py
index 0c8d8f3c8eaa39..ff7e1504f935ed 100644
--- a/var/spack/repos/builtin/packages/protobuf/package.py
+++ b/var/spack/repos/builtin/packages/protobuf/package.py
@@ -150,9 +150,8 @@ def cmake_args(self):
         if not self.spec.satisfies("cxxstd=14") and self.compiler.name == "clang":
             args.extend(
                 [
-                    "-DCMAKE_CXX_FLAGS=-std=c++{0} -D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES=1".format(
-                        self.spec.variants["cxxstd"].value
-                    )
+                    f'-DCMAKE_CXX_FLAGS=-std=c++{self.spec.variants["cxxstd"].value}'
+                    " -D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES=1"
                 ]
             )
 
@@ -168,9 +167,8 @@ def cmake_args(self):
             if not cxxstd == 14 and self.compiler.name == "clang":
                 args.extend(
                     [
-                        "-DCMAKE_CXX_FLAGS=-std=c++{0} -D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES=1".format(
-                            cxxstd
-                        )
+                        f"-DCMAKE_CXX_FLAGS=-std=c++{cxxstd}"
+                        " -D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES=1"
                     ]
                 )
 
diff --git a/var/spack/repos/builtin/packages/rust/package.py b/var/spack/repos/builtin/packages/rust/package.py
index 1f0666a88e4aa3..66e31f14dcbee2 100644
--- a/var/spack/repos/builtin/packages/rust/package.py
+++ b/var/spack/repos/builtin/packages/rust/package.py
@@ -96,6 +96,9 @@ def setup_build_environment(self, env):
         certs = join_path(self.spec["openssl"].prefix, "etc/openssl/cert.pem")
         env.set("CARGO_HTTP_CAINFO", certs)
 
+        # Set CARGO_HOME.
+        env.set("CARGO_HOME", os.path.join(os.path.dirname(self.stage.path), ".cargo"))
+
     def configure(self, spec, prefix):
         opts = []
 
@@ -145,9 +148,6 @@ def configure(self, spec, prefix):
 
         configure(*flags)
 
-    def setup_build_environment(self, env):
-        env.set("CARGO_HOME", os.path.join(os.path.dirname(self.stage.path), ".cargo"))
-
     def build(self, spec, prefix):
         python("./x.py", "build")