about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonathan Pallant (Ferrous Systems) <jonathan.pallant@ferrous-systems.com>2023-11-21 12:59:03 +0000
committerJonathan Pallant (Ferrous Systems) <jonathan.pallant@ferrous-systems.com>2023-11-21 12:59:03 +0000
commitd45eac3d7c1399d96ae12f2337019a982704285e (patch)
tree1c120ed92cc7882dd9b641f0cdf0ead53bb76e70
parentce0051a42fe88e95d55a492c01c75c75739c25e1 (diff)
downloadrust-d45eac3d7c1399d96ae12f2337019a982704285e.tar.gz
rust-d45eac3d7c1399d96ae12f2337019a982704285e.zip
Report missing licenses or copyright text.
Required because spdx-rs 0.5.3 added support for SPDX  2.3 documents and made these fields optional.
-rw-r--r--src/tools/collect-license-metadata/src/reuse.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/collect-license-metadata/src/reuse.rs b/src/tools/collect-license-metadata/src/reuse.rs
index c6a1818ce0d..a5d01935f76 100644
--- a/src/tools/collect-license-metadata/src/reuse.rs
+++ b/src/tools/collect-license-metadata/src/reuse.rs
@@ -17,9 +17,11 @@ pub(crate) fn collect(
 
     let mut result = Vec::new();
     for file in document.file_information {
+        let concluded_license = file.concluded_license.expect("File should have licence info");
+        let copyright_text = file.copyright_text.expect("File should have copyright text");
         let license = interner.intern(License {
-            spdx: file.concluded_license.to_string(),
-            copyright: file.copyright_text.split('\n').map(|s| s.into()).collect(),
+            spdx: concluded_license.to_string(),
+            copyright: copyright_text.split('\n').map(|s| s.into()).collect(),
         });
 
         result.push((file.file_name.into(), license));