{flake, nixd/lspserver}: bump llvm 16 → 19 (#639)

flake.nix

@@ -29,12 +29,12 @@
         let
           inherit (pkgs)
             nixVersions
-            llvmPackages_16
+            llvmPackages_19
             callPackage
             stdenv
             ;
           nix = nixVersions.nix_2_25;
-          llvmPackages = llvmPackages_16;
+          llvmPackages = llvmPackages_19;
           nixf = callPackage ./libnixf { };
           nixt = callPackage ./libnixt { inherit nix; };
           nixd = callPackage ./nixd {

nixd/lspserver/src/Connection.cpp

@@ -227,18 +227,18 @@ bool InboundPort::readDelimitedMessage(std::string &JSONString) {
     auto LineRef = Line.str().trim();
     if (IsInputBlock) {
       // We are in input blocks, read lines and append JSONString.
-      if (LineRef.startswith("#")) // comment
+      if (LineRef.starts_with("#")) // comment
         continue;
 
       // End of the block
-      if (LineRef.startswith("```")) {
+      if (LineRef.starts_with("```")) {
         IsInputBlock = false;
         break;
       }
 
       JSONString += Line;
     } else {
-      if (LineRef.startswith("```json"))
+      if (LineRef.starts_with("```json"))
         IsInputBlock = true;
     }
   }

nixd/lspserver/src/Protocol.cpp

@@ -13,6 +13,7 @@
 #include "lspserver/Protocol.h"
 #include "lspserver/Logger.h"
 #include "lspserver/URI.h"
+#include <llvm/ADT/StringExtras.h>
 #include <llvm/ADT/StringRef.h>
 #include <llvm/ADT/StringSwitch.h>
 #include <llvm/Support/ErrorHandling.h>

nixd/lspserver/src/SourceCode.cpp

@@ -1,5 +1,6 @@
 #include "lspserver/SourceCode.h"
 #include "lspserver/Logger.h"
+#include <llvm/ADT/StringExtras.h>
 #include <llvm/Support/Errc.h>
 
 namespace lspserver {

nixd/lspserver/src/URI.cpp

@@ -36,7 +36,7 @@ class FileSystemScheme : public URIScheme {
   llvm::Expected<std::string>
   getAbsolutePath(llvm::StringRef Authority, llvm::StringRef Body,
                   llvm::StringRef /*HintPath*/) const override {
-    if (!Body.startswith("/"))
+    if (!Body.starts_with("/"))
       return error("File scheme: expect body to be an absolute path starting "
                    "with '/': {0}",
                    Body);
@@ -151,7 +151,7 @@ URI::URI(llvm::StringRef Scheme, llvm::StringRef Authority,
          llvm::StringRef Body)
     : Scheme(Scheme), Authority(Authority), Body(Body) {
   assert(!Scheme.empty());
-  assert((Authority.empty() || Body.startswith("/")) &&
+  assert((Authority.empty() || Body.starts_with("/")) &&
          "URI body must start with '/' when authority is present.");
 }
 
@@ -163,7 +163,7 @@ std::string URI::toString() const {
     return Result;
   // If authority if empty, we only print body if it starts with "/"; otherwise,
   // the URI is invalid.
-  if (!Authority.empty() || llvm::StringRef(Body).startswith("/")) {
+  if (!Authority.empty() || llvm::StringRef(Body).starts_with("/")) {
     Result.append("//");
     percentEncode(Authority, Result);
   }