From d762bfa1953933dfac0a29a74523c25719396b8c Mon Sep 17 00:00:00 2001
From: Oliver Reiche <oliver.reiche@gmail.com>
Date: Sat, 15 Apr 2023 16:28:33 +0200
Subject: imports: Switch to Microsoft GSL implementation

... with two minor code base changes compared to previous
use of gsl-lite:

- dag.hpp: ActionNode::Ptr and ArtifactNode::Ptr are not
  wrapped in gsl::not_null<> anymore, due to lack of support
  for wrapping std::unique_ptr<>. More specifically, the
  move constructor is missing, rendering it impossible to
  use std::vector<>::emplace_back().

- utils/cpp/gsl.hpp: New header file added to implement the
  macros ExpectsAudit() and EnsureAudit(), asserts running
  only in debug builds, which were available in gsl-lite but
  are missing in MS GSL.
---
 test/bootstrap/TARGETS                               | 2 +-
 test/bootstrap/test-mixed-bootstrap.sh               | 8 ++++----
 test/buildtool/storage/local_ac.test.cpp             | 2 +-
 test/utils/TARGETS                                   | 2 +-
 test/utils/remote_execution/bazel_action_creator.hpp | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'test')

diff --git a/test/bootstrap/TARGETS b/test/bootstrap/TARGETS
index 9018ccbf..ee78934e 100644
--- a/test/bootstrap/TARGETS
+++ b/test/bootstrap/TARGETS
@@ -53,7 +53,7 @@
   , "targets":
     [ ["@", "json", "", "json"]
     , ["@", "fmt", "", "fmt"]
-    , ["@", "gsl-lite", "", "gsl-lite"]
+    , ["@", "gsl", "", "gsl"]
     , ["@", "cli11", "", "cli11"]
     , ["@", "ssl", "", "crypto"]
     , ["", "libgit2"]
diff --git a/test/bootstrap/test-mixed-bootstrap.sh b/test/bootstrap/test-mixed-bootstrap.sh
index 61b1f5ea..d43a6a58 100755
--- a/test/bootstrap/test-mixed-bootstrap.sh
+++ b/test/bootstrap/test-mixed-bootstrap.sh
@@ -37,9 +37,9 @@ mkdir -p "${DISTDIR}"
 
 cp -r "${ORIG_LOCALBASE}" "${LOCALBASE}"
 
-# - gsl-liste
-rm -rf "${LOCALBASE}/include/gsl-lite"
-cp distdir/v0.40.0.tar.gz "${DISTDIR}"
+# - gsl
+rm -rf "${LOCALBASE}/include/gsl"
+cp distdir/v4.0.0.tar.gz "${DISTDIR}"
 
 # - fmt
 rm -rf "${LOCALBASE}/include/fmt*"
@@ -50,7 +50,7 @@ cp distdir/fmt-9.1.0.zip "${DISTDIR}"
 
 env LOCALBASE=${LOCALBASE} \
     PACKAGE=YES \
-    NON_LOCAL_DEPS='["gsl-lite", "fmt"]' \
+    NON_LOCAL_DEPS='["com_github_microsoft_gsl", "fmt"]' \
     JUST_BUILD_CONF='{"COMPILER_FAMILY":"clang", "PKG_CONFIG_ARGS":["--define-prefix"]}' \
     python3 ${WRKSRC}/bin/bootstrap.py ${WRKSRC} ${WRKDIR} ${DISTDIR} 2>&1
 
diff --git a/test/buildtool/storage/local_ac.test.cpp b/test/buildtool/storage/local_ac.test.cpp
index f4867e32..a5da6201 100644
--- a/test/buildtool/storage/local_ac.test.cpp
+++ b/test/buildtool/storage/local_ac.test.cpp
@@ -15,7 +15,7 @@
 #include <string>
 
 #include "catch2/catch_test_macros.hpp"
-#include "gsl-lite/gsl-lite.hpp"
+#include "gsl/gsl"
 #include "src/buildtool/file_system/file_system_manager.hpp"
 #include "src/buildtool/storage/storage.hpp"
 #include "test/utils/hermeticity/local.hpp"
diff --git a/test/utils/TARGETS b/test/utils/TARGETS
index 92b086d2..fd94f48c 100644
--- a/test/utils/TARGETS
+++ b/test/utils/TARGETS
@@ -10,7 +10,7 @@
   , "name": ["execution_bazel"]
   , "hdrs": ["remote_execution/bazel_action_creator.hpp"]
   , "deps":
-    [ ["@", "gsl-lite", "", "gsl-lite"]
+    [ ["@", "gsl", "", "gsl"]
     , ["src/buildtool/execution_api/remote", "bazel_network"]
     ]
   , "stage": ["test", "utils"]
diff --git a/test/utils/remote_execution/bazel_action_creator.hpp b/test/utils/remote_execution/bazel_action_creator.hpp
index dd8fa34d..0ee251c8 100644
--- a/test/utils/remote_execution/bazel_action_creator.hpp
+++ b/test/utils/remote_execution/bazel_action_creator.hpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include "gsl-lite/gsl-lite.hpp"
+#include "gsl/gsl"
 #include "src/buildtool/crypto/hash_function.hpp"
 #include "src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp"
 #include "src/buildtool/execution_api/remote/config.hpp"
-- 
cgit v1.2.3