Upgrade to Clang 22

Author: gtaylor

.devcontainer/Dockerfile

@@ -7,10 +7,18 @@ ARG STYLUA_VERSION=2.5.2
 # [Optional] Uncomment this section to install additional vcpkg ports.
 # RUN su vscode -c "${VCPKG_ROOT}/vcpkg install <your-port-name-here>"
 
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+RUN apt-get update \
+    && apt-get -y install --no-install-recommends ca-certificates curl \
+    && curl --location --proto '=https' --tlsv1.2 --fail --silent --show-error \
+    https://apt.llvm.org/llvm-snapshot.gpg.key \
+    --output /etc/apt/trusted.gpg.d/apt.llvm.org.asc \
+    && echo 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-22 main' \
+    > /etc/apt/sources.list.d/llvm.list \
+    && apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends \
-    build-essential ca-certificates clang-20 clang-format-20 clang-tidy-20 clang-tools-20 \
-    clangd-20 curl libsqlite3-dev sqlite3 unzip
+    build-essential clang-22 clang-format-22 clang-tidy-22 clang-tools-22 libclang-rt-22-dev \
+    clangd-22 libsqlite3-dev sqlite3 unzip \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN CMAKE_ARCHIVE="cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz" \
     && curl --location --proto '=https' --tlsv1.2 --fail --silent --show-error \

AGENTS.md

@@ -44,11 +44,11 @@ When writing C code, use the following naming conventions:
 
 ## Available clang tools
 
-I've installed `clang-20`. There are a number of other tools installed, but they all have the version `-20` suffix:
+I've installed `clang-22`. There are a number of other tools installed, but they all have the version `-22` suffix:
 
-* clang-tidy-20
-* clang-format-20
-* clang-apply-replacements-20
-* clang-query-20
+* clang-tidy-22
+* clang-format-22
+* clang-apply-replacements-22
+* clang-query-22
 
 See `ls /usr/bin/clang*` for a full list.

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 4.3)
 
 if(NOT DEFINED CMAKE_C_COMPILER)
-  find_program(CMAKE_C_COMPILER NAMES clang-20 REQUIRED)
+  find_program(CMAKE_C_COMPILER NAMES clang-22 REQUIRED)
 endif()
 
 project(StompyMUX LANGUAGES C)
@@ -49,12 +49,12 @@ option(BTECH_ENABLE_IWYU "Run Include What You Use during project compilation" O
 
 if(BTECH_ENABLE_CLANG_TIDY)
   # Needs to understand C23 `constexpr`, which landed in Clang 19.
-  find_program(CLANG_TIDY_EXECUTABLE NAMES clang-tidy-20 clang-tidy-19 clang-tidy REQUIRED)
+  find_program(CLANG_TIDY_EXECUTABLE NAMES clang-tidy-22 clang-tidy REQUIRED)
   set(CMAKE_C_CLANG_TIDY "${CLANG_TIDY_EXECUTABLE}")
 endif()
 
 if(BTECH_ENABLE_IWYU)
-  find_program(IWYU_EXECUTABLE NAMES include-what-you-use-20 include-what-you-use REQUIRED)
+  find_program(IWYU_EXECUTABLE NAMES include-what-you-use-22 include-what-you-use REQUIRED)
   set(BTECH_IWYU_COMMAND "${IWYU_EXECUTABLE}")
 endif()
 
@@ -173,7 +173,7 @@ configure_file(src/cmake/version.h.in "${CMAKE_BINARY_DIR}/mux/server/version.h"
 
 add_library(btmux_options INTERFACE)
 target_compile_options(btmux_options INTERFACE
-  $<$<COMPILE_LANGUAGE:C>:-Wall -Wextra -Wno-unused-parameter -Werror -Wformat=2 -Wshadow>)
+  $<$<COMPILE_LANGUAGE:C>:-Wall -Wextra -Wno-unused-parameter -Werror -Wno-gcc-install-dir-libstdcxx -Wformat=2 -Wshadow>)
 if(BTECH_ENABLE_ASAN)
   target_compile_options(btmux_options INTERFACE -fsanitize=address)
   target_link_options(btmux_options INTERFACE -fsanitize=address)

TODO

@@ -30,7 +30,4 @@
 
 ## BTech Todos in the /btech/ dir
 
-* Enum for special weapons effects?
-* Enums for sections?
-* Enums for parts and components instead of standalone constants?
 * Break commodities out of hcode?

docs/content/en/docs/installation.md

@@ -26,16 +26,16 @@ Before compiling the sources and running your own game, you'll need to ensure th
 following dependencies are present:
 
 * CMake 4.3 or higher
-* Clang 20 or higher
+* Clang 22 or higher
 * [Just](https://github.com/casey/just) 1.56 or higher
 
 ### Include What You Use
 
 The optional `just iwyu` check requires an IWYU release built against the same
-Clang major version as the project. For Clang 20, install
-`libclang-20-dev`, then build and install IWYU 0.24 (the `clang_20` branch)
+Clang major version as the project. For Clang 22, install
+`libclang-22-dev`, then build and install IWYU 0.26 (the `clang_22` branch)
 from the [upstream repository](https://github.com/include-what-you-use/include-what-you-use).
-Make the executable available as `include-what-you-use-20`, or set `IWYU` to
+Make the executable available as `include-what-you-use-22`, or set `IWYU` to
 its path when running the check:
 
 ```shell

justfile

@@ -3,10 +3,10 @@ set shell := ["bash", "-eu", "-o", "pipefail", "-c"]
 build_dir := ".build"
 iwyu_build_dir := ".iwyu-build"
 build_type := env_var_or_default("CMAKE_BUILD_TYPE", "RelWithDebInfo")
-clang_tidy := env_var_or_default("CLANG_TIDY", "clang-tidy-20")
-run_clang_tidy := env_var_or_default("RUN_CLANG_TIDY", "run-clang-tidy-20")
-clang_format := env_var_or_default("CLANG_FORMAT", "clang-format-20")
-iwyu := env_var_or_default("IWYU", "include-what-you-use-20")
+clang_tidy := env_var_or_default("CLANG_TIDY", "clang-tidy-22")
+run_clang_tidy := env_var_or_default("RUN_CLANG_TIDY", "run-clang-tidy-22")
+clang_format := env_var_or_default("CLANG_FORMAT", "clang-format-22")
+iwyu := env_var_or_default("IWYU", "include-what-you-use-22")
 stylua := env_var_or_default("STYLUA", "stylua")
 
 default: fmt build test install

src/btech/economy/unit_cost.c

@@ -441,7 +441,7 @@ unsigned long long mech_fasa_cost(Mech *mech) {
                             : technology_secondary & STEALTH_ARMOR_TECH ? 50000
                             : technology & HARDA_TECH                   ? 15000
                             : technology_secondary & LT_FF_ARMOR_TECH   ? 15000
-                            : technology_secondary & HVY_FF_ARMOR_TECH  ? 25000
+                            : technology_secondary & HVY_FF_ARMOR_TECH ? 25000
                                                                        : 10000);
 #if COST_DEBUG
     btech_channel_send(

src/btech/movement/aero_move.c

@@ -81,10 +81,10 @@ land_data[] = {
     {CLASS_VTOL, 10, -60, -15, 15, 5, 0,
      "You bring your VTOL to a safe landing.", "lands.",
      "The rotor whines overhead as you lift off into the sky.", "takes off!"},
-    {CLASS_AERO, 10, -30, MIN_TAKEOFF_SPEED *MP1, 999, 20, 10,
+    {CLASS_AERO, 10, -30, MIN_TAKEOFF_SPEED * MP1, 999, 20, 10,
      "You land your AeroFighter safely.", "lands safely.",
      "The Aerofighter launches into the air!", "launches into the air!"},
-    {CLASS_DS, 10, -25, MIN_TAKEOFF_SPEED *MP1, 999, 20, 300,
+    {CLASS_DS, 10, -25, MIN_TAKEOFF_SPEED * MP1, 999, 20, 300,
      "The DropShip lands safely.", "lands safely.",
      "The DropShip's nose lurches upward, and it starts climbing to the sky!",
      "starts climbing to the sky!"},

src/btech/ui/mech_tactical_layout.c

@@ -36,7 +36,7 @@ void tactical_map_sketch(char *buffer, BattleMap *map, Mech *mech, int start_x,
                          int display_columns, int top_offset, int left_offset,
                          bool use_color, bool use_hex_los,
                          bool show_underlying_terrain) {
-  static const char hex_rows[2][310] = {
+  static const char hex_rows[2][311] = {
       "\\][/][\\][/][\\][/][\\][/][\\][/][\\][/][\\][/][\\][/][\\][/][\\][/"
       "][\\][/]["
       "\\][/][\\][/][\\][/][\\][/][\\][/][\\][/][\\][/][\\][/][\\][/][\\][/"

src/mux/lua/lua_internal.h

@@ -55,8 +55,8 @@ extern const char *const LUA_EVENT_NAMES[LUA_EVENT_COUNT];
 extern const char *const LUA_LOCK_NAMES[LUA_LOCK_COUNT];
 extern const char *const LUA_LOCK_OPERATION_NAMES[LUA_LOCK_OPERATION_COUNT];
 extern const char *const LUA_MESSAGE_NAMES[LUA_MESSAGE_COUNT];
-extern const char
-    *const LUA_MESSAGE_OPERATION_NAMES[LUA_MESSAGE_OPERATION_COUNT];
+extern const char *const
+    LUA_MESSAGE_OPERATION_NAMES[LUA_MESSAGE_OPERATION_COUNT];
 
 void lua_set_error(char *error, size_t error_size, const char *format, ...)
     __attribute__((format(printf, 3, 4)));