Move spdx-data (#77)

* Update to 2024

* Exclude upstream

* Release 0.10.9

* Move spdx-data to target

* Revert

* Revert

* Format

* Update MSRV

Author: Jake-Shadle

.github/workflows/ci.yaml

@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.65.0
+      - uses: dtolnay/rust-toolchain@1.85.0
       - run: cargo fetch
       - name: cargo check
         run: cargo check --all-targets --all-features

CHANGELOG.md

@@ -170,7 +170,8 @@ a user provided callback
 - Initial add of spdx crate, based primarily on [`license-exprs`](https://github.com/rust-lang-nursery/license-exprs)
 
 <!-- next-url -->
-[Unreleased]: https://github.com/EmbarkStudios/spdx/compare/0.10.8...HEAD
+[Unreleased]: https://github.com/EmbarkStudios/spdx/compare/0.10.9...HEAD
+[0.10.9]: https://github.com/EmbarkStudios/spdx/compare/0.10.8...0.10.9
 [0.10.8]: https://github.com/EmbarkStudios/spdx/compare/0.10.7...0.10.8
 [0.10.7]: https://github.com/EmbarkStudios/spdx/compare/0.10.6...0.10.7
 [0.10.6]: https://github.com/EmbarkStudios/spdx/compare/0.10.5...0.10.6

Cargo.lock

@@ -6,8 +6,8 @@ authors = [
     "Jake Shadle <[email protected]>",
 ]
 description = "Helper crate for SPDX expressions"
-edition = "2021"
-rust-version = "1.65.0"
+edition = "2024"
+rust-version = "1.85.0"
 homepage = "https://github.com/EmbarkStudios/spdx"
 documentation = "https://docs.rs/spdx"
 readme = "README.md"
@@ -29,11 +29,11 @@ text = []
 
 [dependencies]
 # In most cases expressions are quite small so we can avoid heap allocations
-smallvec = "1.7"
+smallvec = "1.15"
 
 [dev-dependencies]
 # Used to print colored diffs in case of test failures
-similar-asserts = "1.1"
+similar-asserts = "1.7"
 
 [package.metadata.docs.rs]
 all-features = true

Cargo.toml

@@ -1,7 +1,7 @@
 mod minimize;
 mod parser;
 
-use crate::{error::ParseError, LicenseReq};
+use crate::{LicenseReq, error::ParseError};
 pub use minimize::MinimizeError;
 use smallvec::SmallVec;
 use std::fmt;

src/expression.rs

@@ -1,8 +1,8 @@
 use crate::{
+    LicenseItem, LicenseReq, ParseMode,
     error::{ParseError, Reason},
     expression::{ExprNode, Expression, ExpressionReq, Operator},
     lexer::{Lexer, Token},
-    LicenseItem, LicenseReq, ParseMode,
 };
 use smallvec::SmallVec;
 

src/expression/parser.rs

@@ -1,6 +1,6 @@
 use crate::{
-    error::{ParseError, Reason},
     ExceptionId, LicenseId,
+    error::{ParseError, Reason},
 };
 
 /// Parsing configuration for SPDX expression

src/lexer.rs

@@ -467,7 +467,7 @@ pub fn license_version() -> &'static str {
 mod test {
     use super::LicenseItem;
 
-    use crate::{license_id, Expression};
+    use crate::{Expression, license_id};
 
     #[test]
     fn gnu_or_later_display() {

src/lib.rs

@@ -1,7 +1,7 @@
 use crate::{
+    ExceptionId, LicenseItem, LicenseReq,
     error::{ParseError, Reason},
     lexer::{Lexer, Token},
-    ExceptionId, LicenseItem, LicenseReq,
 };
 use std::fmt;
 
@@ -139,7 +139,7 @@ impl Licensee {
                         original: original.to_owned(),
                         span: lt.span,
                         reason: Reason::Unexpected(&["<license>"]),
-                    })
+                    });
                 }
             }
         };
@@ -163,7 +163,7 @@ impl Licensee {
                                     original: original.to_owned(),
                                     span: lt.span,
                                     reason: Reason::Unexpected(&["<exception>"]),
-                                })
+                                });
                             }
                         }
                     }
@@ -172,7 +172,7 @@ impl Licensee {
                             original: original.to_owned(),
                             span: lt.span,
                             reason: Reason::Unexpected(&["WITH"]),
-                        })
+                        });
                     }
                 }
             }
@@ -288,7 +288,7 @@ impl AsRef<LicenseReq> for Licensee {
 
 #[cfg(test)]
 mod test {
-    use crate::{exception_id, license_id, LicenseItem, LicenseReq, Licensee};
+    use crate::{LicenseItem, LicenseReq, Licensee, exception_id, license_id};
 
     const LICENSEES: &[&str] = &[
         "LicenseRef-Embark-Proprietary",

src/licensee.rs

@@ -54,9 +54,11 @@ fn handles_deprecated_fsf_and_osi() {
 
 #[test]
 fn handles_exception_deprecation() {
-    assert!(exception_id("Nokia-Qt-exception-1.1")
-        .unwrap()
-        .is_deprecated());
+    assert!(
+        exception_id("Nokia-Qt-exception-1.1")
+            .unwrap()
+            .is_deprecated()
+    );
 }
 
 #[test]