Produce an error if the user specifies an empty conditional inclusion…

…/exclusion for any entry

Closes #75

docs/file_format/file.md

@@ -331,7 +331,7 @@ segments:
 
 ### Valid values
 
-A list of two-tuples of strings.
+A non-empty list of two-tuples of strings.
 
 ## `include_if_all`
 
@@ -363,7 +363,7 @@ segments:
 
 ### Valid values
 
-A list of two-tuples of strings.
+A non-empty list of two-tuples of strings.
 
 ## `exclude_if_any`
 
@@ -395,7 +395,7 @@ segments:
 
 ### Valid values
 
-A list of two-tuples of strings.
+A non-empty list of two-tuples of strings.
 
 ## `exclude_if_all`
 
@@ -427,4 +427,4 @@ segments:
 
 ### Valid values
 
-A list of two-tuples of strings.
+A non-empty list of two-tuples of strings.

slinky/src/absent_nullable.rs

@@ -51,6 +51,28 @@ impl<T> AbsentNullable<T> {
         }
     }
 
+    pub fn get_non_null_not_empty<F>(self, name: &str, default: F) -> Result<T, SlinkyError>
+    where
+        F: FnOnce() -> T,
+        T: Default + PartialEq,
+    {
+        match self {
+            AbsentNullable::Absent => Ok(default()),
+            AbsentNullable::Null => Err(SlinkyError::NullValueOnNonNull {
+                name: name.to_string(),
+            }),
+            AbsentNullable::Value(v) => {
+                if v == T::default() {
+                    Err(SlinkyError::EmptyValue {
+                        name: name.to_string(),
+                    })
+                } else {
+                    Ok(v)
+                }
+            }
+        }
+    }
+
     pub fn get_non_null_no_default(self, name: &str) -> Result<Option<T>, SlinkyError> {
         match self {
             AbsentNullable::Absent => Ok(None),

slinky/src/file_info.rs

@@ -252,16 +252,16 @@ impl FileInfoSerial {
 
         let include_if_any = self
             .include_if_any
-            .get_non_null("include_if_any", Vec::new)?;
+            .get_non_null_not_empty("include_if_any", Vec::new)?;
         let include_if_all = self
             .include_if_all
-            .get_non_null("include_if_all", Vec::new)?;
+            .get_non_null_not_empty("include_if_all", Vec::new)?;
         let exclude_if_any = self
             .exclude_if_any
-            .get_non_null("exclude_if_any", Vec::new)?;
+            .get_non_null_not_empty("exclude_if_any", Vec::new)?;
         let exclude_if_all = self
             .exclude_if_all
-            .get_non_null("exclude_if_all", Vec::new)?;
+            .get_non_null_not_empty("exclude_if_all", Vec::new)?;
 
         Ok(FileInfo {
             path,

slinky/src/segment.rs

@@ -233,16 +233,16 @@ impl SegmentSerial {
 
         let include_if_any = self
             .include_if_any
-            .get_non_null("include_if_any", Vec::new)?;
+            .get_non_null_not_empty("include_if_any", Vec::new)?;
         let include_if_all = self
             .include_if_all
-            .get_non_null("include_if_all", Vec::new)?;
+            .get_non_null_not_empty("include_if_all", Vec::new)?;
         let exclude_if_any = self
             .exclude_if_any
-            .get_non_null("exclude_if_any", Vec::new)?;
+            .get_non_null_not_empty("exclude_if_any", Vec::new)?;
         let exclude_if_all = self
             .exclude_if_all
-            .get_non_null("exclude_if_all", Vec::new)?;
+            .get_non_null_not_empty("exclude_if_all", Vec::new)?;
 
         let alloc_sections = self
             .alloc_sections

slinky/src/symbol_assignment.rs

@@ -68,16 +68,16 @@ impl SymbolAssignmentSerial {
 
         let include_if_any = self
             .include_if_any
-            .get_non_null("include_if_any", Vec::new)?;
+            .get_non_null_not_empty("include_if_any", Vec::new)?;
         let include_if_all = self
             .include_if_all
-            .get_non_null("include_if_all", Vec::new)?;
+            .get_non_null_not_empty("include_if_all", Vec::new)?;
         let exclude_if_any = self
             .exclude_if_any
-            .get_non_null("exclude_if_any", Vec::new)?;
+            .get_non_null_not_empty("exclude_if_any", Vec::new)?;
         let exclude_if_all = self
             .exclude_if_all
-            .get_non_null("exclude_if_all", Vec::new)?;
+            .get_non_null_not_empty("exclude_if_all", Vec::new)?;
 
         Ok(SymbolAssignment {
             name,

tests/panics/file_exclude_if_all_empty.yaml

@@ -0,0 +1,4 @@
+segments:
+  - name: main
+    files:
+      - { path: main.o, exclude_if_all: [] }

tests/panics/file_exclude_if_any_empty.yaml

@@ -0,0 +1,4 @@
+segments:
+  - name: main
+    files:
+      - { path: main.o, exclude_if_any: [] }

tests/panics/file_include_if_all_empty.yaml

@@ -0,0 +1,4 @@
+segments:
+  - name: main
+    files:
+      - { path: main.o, include_if_all: [] }

tests/panics/file_include_if_any_empty.yaml

@@ -0,0 +1,4 @@
+segments:
+  - name: main
+    files:
+      - { path: main.o, include_if_any: [] }

tests/panics/segment_exclude_if_all_empty.yaml

@@ -0,0 +1,5 @@
+segments:
+  - name: main
+    exclude_if_all: []
+    files:
+      - { path: main.o }

tests/panics/segment_exclude_if_any_empty.yaml

@@ -0,0 +1,5 @@
+segments:
+  - name: main
+    exclude_if_any: []
+    files:
+      - { path: main.o }

tests/panics/segment_include_if_all_empty.yaml

@@ -0,0 +1,5 @@
+segments:
+  - name: main
+    include_if_all: []
+    files:
+      - { path: main.o }

tests/panics/segment_include_if_any_empty.yaml

@@ -0,0 +1,5 @@
+segments:
+  - name: main
+    include_if_any: []
+    files:
+      - { path: main.o }

tests/panics/symbol_assignment_exclude_if_all_empty.yaml

@@ -0,0 +1,9 @@
+segments:
+  - name: main
+    files:
+      - { path: main.o }
+
+symbol_assignments:
+  - name: dummy_test
+    value: 0x80801234
+    exclude_if_all: []

tests/panics/symbol_assignment_exclude_if_any_empty.yaml

@@ -0,0 +1,9 @@
+segments:
+  - name: main
+    files:
+      - { path: main.o }
+
+symbol_assignments:
+  - name: dummy_test
+    value: 0x80801234
+    exclude_if_any: []

tests/panics/symbol_assignment_include_if_all_empty.yaml

@@ -0,0 +1,9 @@
+segments:
+  - name: main
+    files:
+      - { path: main.o }
+
+symbol_assignments:
+  - name: dummy_test
+    value: 0x80801234
+    include_if_all: []

tests/panics/symbol_assignment_include_if_any_empty.yaml

@@ -0,0 +1,9 @@
+segments:
+  - name: main
+    files:
+      - { path: main.o }
+
+symbol_assignments:
+  - name: dummy_test
+    value: 0x80801234
+    include_if_any: []