From e5705ba07b6bdbbad63ae938cd170ad312589021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 13 Nov 2024 23:24:04 +0100
Subject: [PATCH] nixos-option: enable readability lint

---
 pkgs/tools/nix/nixos-option/.clang-tidy              | 8 ++++----
 pkgs/tools/nix/nixos-option/src/libnix-copy-paste.cc | 2 ++
 pkgs/tools/nix/nixos-option/src/nixos-option.cc      | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/nix/nixos-option/.clang-tidy b/pkgs/tools/nix/nixos-option/.clang-tidy
index 6818a5afbe4c..71c13839afe5 100644
--- a/pkgs/tools/nix/nixos-option/.clang-tidy
+++ b/pkgs/tools/nix/nixos-option/.clang-tidy
@@ -6,17 +6,17 @@ Checks:
 - -bugprone-easily-swappable-parameters
 - performance-*
 - modernize-*
+- readability-*
+# don't find them too problematic
+- -readability-identifier-length
+- -readability-magic-numbers
 # TODO
-#  - readability-*
 #  - misc-*
 #  - portability-*
 #  - concurrency-*
 #  - google-*
 #  - -google-readability-todo
 #
-#  # don't find them too problematic
-#  - -readability-identifier-length
-#  - -readability-magic-numbers
 #
 #  - cppcoreguidelines-*
 #  - -cppcoreguidelines-avoid-magic-numbers
diff --git a/pkgs/tools/nix/nixos-option/src/libnix-copy-paste.cc b/pkgs/tools/nix/nixos-option/src/libnix-copy-paste.cc
index 22532c71788c..15a411258b93 100644
--- a/pkgs/tools/nix/nixos-option/src/libnix-copy-paste.cc
+++ b/pkgs/tools/nix/nixos-option/src/libnix-copy-paste.cc
@@ -6,6 +6,7 @@
 #include "libnix-copy-paste.hh"
 #include <nix/print.hh>
 
+// NOLINTBEGIN
 // From nix/src/nix/repl.cc
 bool isVarName(const std::string_view & s)
 {
@@ -21,3 +22,4 @@ bool isVarName(const std::string_view & s)
             return false;
     return true;
 }
+// NOLINTEND
diff --git a/pkgs/tools/nix/nixos-option/src/nixos-option.cc b/pkgs/tools/nix/nixos-option/src/nixos-option.cc
index 34acb78c66b6..8b553bae8bbf 100644
--- a/pkgs/tools/nix/nixos-option/src/nixos-option.cc
+++ b/pkgs/tools/nix/nixos-option/src/nixos-option.cc
@@ -168,7 +168,7 @@ std::string quoteAttribute(const std::string_view & attribute)
     return buf.str();
 }
 
-const std::string appendPath(const std::string & prefix, const std::string_view & suffix)
+std::string appendPath(const std::string & prefix, const std::string_view & suffix)
 {
     if (prefix.empty()) {
         return quoteAttribute(suffix);
@@ -376,7 +376,7 @@ void describeDerivation(Context & ctx, Out & out, Value v)
 {
     // Copy-pasted from nix/src/nix/repl.cc printDerivation()  :(
     std::optional<nix::StorePath> storePath = std::nullopt;
-    if (auto i = v.attrs()->get(ctx.state.sDrvPath)) {
+    if (const auto *i = v.attrs()->get(ctx.state.sDrvPath)) {
         nix::NixStringContext context;
         storePath = ctx.state.coerceToStorePath(i->pos, *i->value, context, "while evaluating the drvPath of a derivation");
     }
@@ -457,7 +457,7 @@ void printMultiLineString(Out & out, const Value & v)
 void printValue(Context & ctx, Out & out, std::variant<Value, std::exception_ptr> maybeValue, const std::string & path)
 {
     try {
-        if (auto ex = std::get_if<std::exception_ptr>(&maybeValue)) {
+        if (auto *ex = std::get_if<std::exception_ptr>(&maybeValue)) {
             std::rethrow_exception(*ex);
         }
         Value v = evaluateValue(ctx, std::get<Value>(maybeValue));