Merge branch 'danmar:main' into chr_Fix11845

.github/workflows/asan.yml

@@ -39,6 +39,7 @@ jobs:
 
       - name: Install clang
         run: |
+          sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 16

.github/workflows/clang-tidy.yml

@@ -27,6 +27,7 @@ jobs:
 
       - name: Install clang
         run: |
+          sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 16

.github/workflows/scriptcheck.yml

@@ -37,12 +37,11 @@ jobs:
 
     needs: build
     # 'ubuntu-22.04' removes Python 2.7, 3.5 and 3.6 so keep the previous LTS version
+    # 'ubutunu-20.04' no longer works on 2.7 - TODO: re-added in a different way or remove support for it?
     runs-on: ubuntu-20.04
-        container:
-            image: python:2.7.18-buster
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
       fail-fast: false
 
     steps:

.github/workflows/tsan.yml

@@ -39,6 +39,7 @@ jobs:
 
       - name: Install clang
         run: |
+          sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 16

.github/workflows/ubsan.yml

@@ -39,6 +39,7 @@ jobs:
 
       - name: Install clang
         run: |
+          sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 16

addons/misra_9.py

@@ -418,7 +418,7 @@ def misra_9_x(self, data, rule, rawTokens = None):
                                 has_var = True
                                 continue
                             unknown_constant = True
-                            cppcheckdata.reportError(sz, 'error', f'Unknown constant {t.str}, please review configuration', 'misra', 'config')
+                            cppcheckdata.reportError(sz, 'error', 'Unknown constant {}, please review configuration'.format(t.str), 'misra', 'config')
                             has_config_errors = True
                         if t.isArithmeticalOp:
                             tokens += [t.astOperand1, t.astOperand2]

lib/checkclass.cpp

@@ -1067,7 +1067,7 @@ void CheckClass::noConstructorError(const Token *tok, const std::string &classna
 void CheckClass::noExplicitConstructorError(const Token *tok, const std::string &classname, bool isStruct)
 {
     const std::string message(std::string(isStruct ? "Struct" : "Class") + " '$symbol' has a constructor with 1 argument that is not explicit.");
-    const std::string verbose(message + " Such constructors should in general be explicit for type safety reasons. Using the explicit keyword in the constructor means some mistakes when using the class can be avoided.");
+    const std::string verbose(message + " Such, so called \"Converting constructors\", should in general be explicit for type safety reasons as that prevents unintended implicit conversions.");
     reportError(tok, Severity::style, "noExplicitConstructor", "$symbol:" + classname + '\n' + message + '\n' + verbose, CWE398, Certainty::normal);
 }