fix(feature): fix when building without router feature, remove useless ffi export

Author: joelwurtz

src/action/mod.rs

@@ -25,6 +25,7 @@ pub use status_code_update::StatusCodeUpdate;
 use std::collections::HashMap;
 use std::fmt::Debug;
 use std::iter::FromIterator;
+#[cfg(feature = "router")]
 use std::sync::Arc;
 #[cfg(feature = "router")]
 pub use trace::TraceAction;

src/api/explain_request.rs

@@ -1,7 +1,8 @@
 use crate::{
     action::{Action, UnitTrace},
     http::{Header, Request},
-    router::{Router, RouterConfig, Trace},
+    router::{Router, Trace},
+    router_config::RouterConfig,
 };
 use std::sync::Arc;
 

src/api/ffi.rs

@@ -1,9 +1,9 @@
 use crate::action::Action;
-use crate::api::{Log, RulesMessage};
+use crate::api::Log;
 use crate::ffi_helpers::{c_char_to_str, string_to_c_char};
 use crate::http::ffi::{header_map_to_http_headers, HeaderMap};
 use crate::http::Request;
-use serde_json::{from_str as json_decode, to_string as json_encode};
+use serde_json::to_string as json_encode;
 use std::os::raw::{c_char, c_ushort};
 use std::ptr::null;
 
@@ -12,22 +12,6 @@ pub unsafe extern "C" fn redirectionio_api_get_rule_api_version() -> *const c_ch
     string_to_c_char("2.0.0".to_string())
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn redirectionio_api_create_rules_message_from_json(content: *mut c_char) -> *const RulesMessage {
-    let message_string = match c_char_to_str(content) {
-        None => return null(),
-        Some(str) => str,
-    };
-
-    match json_decode(message_string) {
-        Err(error) => {
-            error!("{}", error);
-            null()
-        }
-        Ok(message) => Box::into_raw(Box::new(message)),
-    }
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn redirectionio_api_create_log_in_json(
     _request: *mut Request,

src/api/impact.rs

@@ -3,7 +3,8 @@ use crate::api::rules_message::RuleChangeSet;
 use crate::api::{Example, Rule};
 use crate::http::Header;
 use crate::http::Request;
-use crate::router::{Router, RouterConfig, Trace};
+use crate::router::{Router, Trace};
+use crate::router_config::RouterConfig;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use url::Url;

src/api/rule.rs

@@ -1,7 +1,8 @@
 use crate::api::{BodyFilter, DateTimeConstraint, Example, HeaderFilter, IpConstraint, Marker, Source, Variable};
 use crate::http::Request;
 use crate::marker::{Marker as RouteMarker, MarkerString, StaticOrDynamic, Transform};
-use crate::router::{IntoRoute, Route, RouteDateTime, RouteHeader, RouteHeaderKind, RouteIp, RouteTime, RouteWeekday, RouterConfig};
+use crate::router::{IntoRoute, Route, RouteDateTime, RouteHeader, RouteHeaderKind, RouteIp, RouteTime, RouteWeekday};
+use crate::router_config::RouterConfig;
 use cidr::AnyIpCidr;
 use percent_encoding::{utf8_percent_encode, AsciiSet, CONTROLS};
 use serde::{Deserialize, Serialize};

src/api/test_examples.rs

@@ -4,7 +4,8 @@ use std::sync::Arc;
 use crate::{
     action::{Action, UnitTrace},
     http::Request,
-    router::{Router, RouterConfig},
+    router::Router,
+    router_config::RouterConfig,
 };
 
 use super::{Example, Rule};

src/api/unit_ids.rs

@@ -5,7 +5,8 @@ use crate::action::{Action, UnitTrace};
 use crate::api::rules_message::RuleChangeSet;
 use crate::api::{Example, Rule};
 use crate::http::Request;
-use crate::router::{Router, RouterConfig};
+use crate::router::Router;
+use crate::router_config::RouterConfig;
 use serde::{Deserialize, Serialize};
 
 // Input

src/ffi.rs

@@ -1,6 +1,6 @@
 use crate::ffi_helpers::{c_char_to_str, string_to_c_char};
 use crate::http::{Header, PathAndQueryWithSkipped, Request, TrustedProxies};
-use crate::router::RouterConfig;
+use crate::router_config::RouterConfig;
 use serde_json::{from_str as json_decode, to_string as json_encode};
 use std::os::raw::c_char;
 use std::ptr::null;

src/http/ffi.rs

@@ -1,16 +1,11 @@
-#[cfg(feature = "router")]
-use crate::router::RouterConfig;
-#[cfg(feature = "router")]
+use crate::router_config::RouterConfig;
 use http::uri::PathAndQuery;
 use percent_encoding::{utf8_percent_encode, AsciiSet, CONTROLS};
 use serde::{Deserialize, Serialize};
-#[cfg(feature = "router")]
 use std::collections::BTreeMap;
-#[cfg(feature = "router")]
 use url::form_urlencoded::parse as parse_query;
 
 const URL_ENCODE_SET: &AsciiSet = &CONTROLS.add(b' ').add(b'"').add(b'#').add(b'<').add(b'>');
-#[cfg(feature = "router")]
 const QUERY_ENCODE_SET: &AsciiSet = &CONTROLS.add(b' ').add(b'"').add(b'#').add(b'<').add(b'>').add(b'+');
 
 #[derive(Serialize, Deserialize, Debug, Clone, Hash)]
@@ -37,7 +32,6 @@ impl PathAndQueryWithSkipped {
         }
     }
 
-    #[cfg(feature = "router")]
     pub fn from_config(config: &RouterConfig, path_and_query_str: &str) -> Self {
         let url = sanitize_url(path_and_query_str);