From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 18 May 2021 19:11:51 +0000 (+0100)
Subject: bundles: Do not use ArrayVec to unpack a possibly-too-long thing
X-Git-Tag: otter-0.6.0~160
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f590231db7900a5240d1590b3b2f8eb6587ab1eb;p=otter.git

bundles: Do not use ArrayVec to unpack a possibly-too-long thing

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

diff --git a/src/bundles.rs b/src/bundles.rs
index 09e06e61..6a58e84d 100644
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -548,9 +548,10 @@ fn parse_bundle<EH>(id: Id, instance: &InstanceName, file: File, eh: EH,
   let mut libs = Vec::new();
   for (name,i) in &za {
     eh.besteffort(|| Ok::<_,LE>(if_chain!{
-      if let Ok([dir, file]) = name.as_ref().split('/')
-        .collect::<ArrayVec<[&str;2]>>()
-        .into_inner();
+      let mut split = name.as_ref().split('/');
+      if let Some(dir)  = split.next();
+      if let Some(file) = split.next();
+      if let None       = split.next();
       if unicase::eq(dir, "library");
       if let Some((base, ext)) = file.rsplit_once('.');
       if unicase::eq(ext, "toml");