From 2b8cb98d453384b23dc07b4116b10643ceb72857 Mon Sep 17 00:00:00 2001
From: woodruffw-bot <william+ai@yossarian.net>
Date: Mon, 30 Mar 2026 15:44:43 +0000
Subject: [PATCH] Make `fluent-uri` an optional dependency, enabled by default

This allows downstream users to disable the `fluent-uri` feature to
remove the dependency when URI validation is not needed.

https://claude.ai/code/session_01H51ccpYf6jhtzujzWiypPc
Signed-off-by: woodruffw-bot <william+ai@yossarian.net>
---
 cyclonedx-bom/Cargo.toml                 |  6 +++++-
 cyclonedx-bom/src/external_models/uri.rs | 15 ++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/cyclonedx-bom/Cargo.toml b/cyclonedx-bom/Cargo.toml
index c6d25234..360b73bf 100644
--- a/cyclonedx-bom/Cargo.toml
+++ b/cyclonedx-bom/Cargo.toml
@@ -14,9 +14,13 @@ license.workspace = true
 repository.workspace = true
 rust-version.workspace = true
 
+[features]
+default = ["fluent-uri"]
+fluent-uri = ["dep:fluent-uri"]
+
 [dependencies]
 base64 = "0.22.1"
-fluent-uri = "0.4.1"
+fluent-uri = { version = "0.4.1", optional = true }
 indexmap = "2.2.2"
 once_cell = "1.18.0"
 ordered-float = { version = "5.0.0", default-features = false }
diff --git a/cyclonedx-bom/src/external_models/uri.rs b/cyclonedx-bom/src/external_models/uri.rs
index 8a511297..3be41780 100644
--- a/cyclonedx-bom/src/external_models/uri.rs
+++ b/cyclonedx-bom/src/external_models/uri.rs
@@ -18,7 +18,6 @@
 
 use std::{convert::TryFrom, str::FromStr};
 
-use fluent_uri::UriRef as Url;
 use purl::{GenericPurl, GenericPurlBuilder};
 use thiserror::Error;
 
@@ -64,8 +63,9 @@ impl AsRef<str> for Purl {
     }
 }
 
-pub fn validate_uri(uri: &Uri) -> Result<(), ValidationError> {
-    if Url::parse(uri.0.as_str()).is_err() {
+pub fn validate_uri(_uri: &Uri) -> Result<(), ValidationError> {
+    #[cfg(feature = "fluent-uri")]
+    if fluent_uri::UriRef::parse(_uri.0.as_str()).is_err() {
         return Err(ValidationError::new("Uri does not conform to RFC 3986"));
     }
     Ok(())
@@ -88,12 +88,13 @@ impl TryFrom<String> for Uri {
     type Error = UriError;
 
     fn try_from(value: String) -> Result<Self, Self::Error> {
-        match Url::parse(value.as_str()) {
-            Ok(_) => Ok(Uri(value)),
-            Err(_) => Err(UriError::InvalidUri(
+        #[cfg(feature = "fluent-uri")]
+        if fluent_uri::UriRef::parse(value.as_str()).is_err() {
+            return Err(UriError::InvalidUri(
                 "Uri does not conform to RFC 3986".to_string(),
-            )),
+            ));
         }
+        Ok(Uri(value))
     }
 }