flake: update the lock (#359)

Fixes: #357
nix-community · Mar 11, 2024 · eb40e5b · eb40e5b
2 parents 548226e + 2a6d140
commit eb40e5b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 47 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -12,7 +12,7 @@
     perSystem = { config, self', inputs', pkgs, system, ... }:
       with pkgs;
       let
-        nix = nixVersions.nix_2_16;
+        nix = nixVersions.nix_2_19;
         llvmPackages = llvmPackages_16;
         nixd = callPackage ./default.nix {
           inherit nix;

diff --git a/libnixt/lib/Deserialize.cpp b/libnixt/lib/Deserialize.cpp
@@ -46,10 +46,6 @@ class ASTDecoder {
     return create<nix::ExprString>(eat<std::string>());
   }
 
-  nix::ExprPath *decodeExprPath() {
-    return create<nix::ExprPath>(eat<nix::Path>());
-  }
-
   nix::ExprVar *decodeExprVar() {
     auto Pos = decodePosIdx();
     auto Name = decodeSymbol();
@@ -76,8 +72,6 @@ class ASTDecoder {
       return decodeExprFloat();
     case EncodeKind::ExprString:
       return decodeExprString();
-    case EncodeKind::ExprPath:
-      return decodeExprPath();
     case EncodeKind::ExprVar:
       return decodeExprVar();
     default:
@@ -112,9 +106,6 @@ template <> nix::Pos::Origin consume<nix::Pos::Origin>(BytesRef &Data) {
   case 2:
     return nix::Pos::Stdin{nix::make_ref<std::string>("")};
     break;
-  case 3:
-    return nix::CanonPath(consume<std::string>(Data));
-    break;
   default:
     assert(false && "Unknown origin");
     break;

diff --git a/libnixt/lib/Serialize.cpp b/libnixt/lib/Serialize.cpp
@@ -33,13 +33,13 @@ class ASTEncoder {
   void encodeExprInt(const nix::ExprInt *E) {
     assert(E);
     ExprMap[E] = encode(OS, EncodeKind::ExprInt);
-    encode(OS, E->n);
+    encode(OS, E->v.integer);
   }
 
   void encodeExprFloat(const nix::ExprFloat *E) {
     assert(E);
     ExprMap[E] = encode(OS, EncodeKind::ExprFloat);
-    encode(OS, E->nf);
+    encode(OS, E->v.fpoint);
   }
 
   void encodeExprString(const nix::ExprString *E) {

diff --git a/libnixt/test/Deserialize.cpp b/libnixt/test/Deserialize.cpp
@@ -44,14 +44,14 @@ void checkEmpty(BytesRef &Data) { EXPECT_EQ(lengthof(Data), 0); }
 TEST_F(DeserializeTest, ExprInt) {
   auto Data = encode(mkInt(0xdeadbeef).get());
   auto *E = consumeAST(Data, Pool, PT, ST);
-  EXPECT_EQ(static_cast<nix::ExprInt *>(E)->n, 0xdeadbeef);
+  EXPECT_EQ(static_cast<nix::ExprInt *>(E)->v.integer, 0xdeadbeef);
   checkEmpty(Data);
 }
 
 TEST_F(DeserializeTest, ExprFloat) {
   auto Data = encode(new nix::ExprFloat{3.14});
   auto *E = consumeAST(Data, Pool, PT, ST);
-  EXPECT_EQ(static_cast<nix::ExprFloat *>(E)->nf, 3.14);
+  EXPECT_EQ(static_cast<nix::ExprFloat *>(E)->v.fpoint, 3.14);
   checkEmpty(Data);
 }
 
@@ -62,13 +62,6 @@ TEST_F(DeserializeTest, ExprString) {
   checkEmpty(Data);
 }
 
-TEST_F(DeserializeTest, ExprPath) {
-  auto Data = encode(new nix::ExprPath{"hello"});
-  auto *E = consumeAST(Data, Pool, PT, ST);
-  EXPECT_EQ(static_cast<nix::ExprPath *>(E)->s, "hello"s);
-  checkEmpty(Data);
-}
-
 TEST_F(DeserializeTest, ExprVar) {
   auto EV = std::make_unique<nix::ExprVar>(somePos(), ST.create("hello"));
   EV->level = 43;

diff --git a/libnixt/test/Serialize.cpp b/libnixt/test/Serialize.cpp
@@ -85,13 +85,6 @@ TEST_F(SerializeTest, Origin_String) {
   checkEmpty(Data);
 }
 
-TEST_F(SerializeTest, Origin_Path) {
-  auto Data = encode(nix::CanonPath("/"));
-  check(Data, (std::size_t)3);
-  check(Data, "/"s);
-  checkEmpty(Data);
-}
-
 TEST_F(SerializeTest, ExprInt) {
   auto Data = encode(mkInt(0xdeadbeef).get());
   checkASTHeader(Data);
@@ -126,16 +119,6 @@ TEST_F(SerializeTest, ExprString) {
   checkEmpty(Data);
 }
 
-TEST_F(SerializeTest, ExprPath) {
-  auto EP = std::make_unique<nix::ExprPath>(nix::Path{"hello"});
-  auto Data = encode(EP.get());
-  checkASTHeader(Data);
-  checkTrivialOrigin(Data);
-  check(Data, EncodeKind::ExprPath);
-  check(Data, "hello"s);
-  checkEmpty(Data);
-}
-
 TEST_F(SerializeTest, ExprVar) {
   auto EV = std::make_unique<nix::ExprVar>(somePos(), ST.create("hello"));
   EV->level = 43;