From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 3 May 2020 21:59:58 +0000 (+0100)
Subject: nailing-cargo: Try TOML::Tiny
X-Git-Tag: nailing-cargo/1.0.0~232
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5f3b840503120eb79d31207cd1b76ab5f624d1e8;p=nailing-cargo.git

nailing-cargo: Try TOML::Tiny

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/nailing-cargo b/nailing-cargo
index ed95576..4519795 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -40,8 +40,7 @@
 #    subdir
 
 use strict;
-use TOML::Parser;
-use TOML;
+use TOML::Tiny;
 use POSIX;
 use Fcntl qw(LOCK_EX);
 use File::Compare;
@@ -68,11 +67,10 @@ sub read_or_enoent ($) {
 
 sub toml_or_enoent ($$) {
     my ($f,$what) = @_;
-    my $parser = TOML::Parser->new();
     my $toml = read_or_enoent($f) // return;
-    my $v = $parser->parse($toml);
-#    die "$self: parse TOML: $what: $f: $e\n" unless defined $v;
-#    die "$e ?" if length $e;
+    my ($v,$e) = from_toml($toml);
+    die "$self: parse TOML: $what: $f: $e\n" unless defined $v;
+    die "$e ?" if length $e;
     $v;
 }