From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 25 Jul 2020 16:25:47 +0000 (+0100)
Subject: nailing-cargo: Break out get_dependency_tables
X-Git-Tag: nailing-cargo/1.0.0~79
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c00090f6177674046b92c9b7663312cdf15e1ac4;p=nailing-cargo.git

nailing-cargo: Break out get_dependency_tables

NFC.  This function needs enhancing.

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

diff --git a/nailing-cargo b/nailing-cargo
index f015b89..512e559 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -239,6 +239,17 @@ sub readnail () {
   unshift @configs, $nail;
 }
 
+sub get_dependency_tables ($) {
+  my ($toml) = @_;
+  my @keys = qw(dependencies build-dependencies dev-dependencies);
+  my @r;
+  foreach my $k (@keys) {
+    my $deps = $toml->{$k};
+    push @r, $deps if $deps;
+  }
+  @r;
+}
+
 our @alt_cargo_lock_stat;
 
 sub consider_alt_cargo_lock () {
@@ -423,8 +434,7 @@ sub calculate () {
   }
   foreach my $mf (keys %manifests) {
     my $toml = $manifests{$mf};
-    foreach my $k (qw(dependencies build-dependencies dev-dependencies)) {
-      my $deps = $toml->{$k};
+    foreach my $deps (get_dependency_tables $toml) {
       next unless $deps;
       foreach my $p (keys %packagemap) {
 	my $info = $deps->{$p};