From d2d9c91525cfbd327e9c1235885a02392d133276 Mon Sep 17 00:00:00 2001 From: K <51281148+K-dash@users.noreply.github.com> Date: Thu, 1 Jan 2026 01:26:03 +0900 Subject: [PATCH] Refactor data module to interop; add conversion utilities --- src/{data => interop}/convert.rs | 2 +- src/{data => interop}/mod.rs | 0 src/{data => interop}/value.rs | 0 src/lib.rs | 2 +- src/ops/apply/coerce.rs | 4 ++-- src/ops/apply/core.rs | 4 ++-- src/ops/apply/map.rs | 2 +- src/ops/apply/mod.rs | 2 +- src/ops/apply/seq.rs | 4 ++-- src/ops/apply/text.rs | 2 +- src/py/blueprint.rs | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) rename src/{data => interop}/convert.rs (99%) rename src/{data => interop}/mod.rs (100%) rename src/{data => interop}/value.rs (100%) diff --git a/src/data/convert.rs b/src/interop/convert.rs similarity index 99% rename from src/data/convert.rs rename to src/interop/convert.rs index 055c5ae..ad4b752 100644 --- a/src/data/convert.rs +++ b/src/interop/convert.rs @@ -153,7 +153,7 @@ pub fn serde_to_value(value: SerdeValue) -> Value { #[cfg(test)] mod tests { use super::serde_to_value; - use crate::data::Value; + use crate::interop::Value; use serde_json::json; #[test] diff --git a/src/data/mod.rs b/src/interop/mod.rs similarity index 100% rename from src/data/mod.rs rename to src/interop/mod.rs diff --git a/src/data/value.rs b/src/interop/value.rs similarity index 100% rename from src/data/value.rs rename to src/interop/value.rs diff --git a/src/lib.rs b/src/lib.rs index 1caa77d..ae8d044 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -mod data; +mod interop; mod ops; mod py; diff --git a/src/ops/apply/coerce.rs b/src/ops/apply/coerce.rs index 6b3da4e..0da0ba8 100644 --- a/src/ops/apply/coerce.rs +++ b/src/ops/apply/coerce.rs @@ -1,6 +1,6 @@ use chrono::{NaiveDate, NaiveDateTime, NaiveTime, TimeZone, Utc}; -use crate::data::{serde_to_value, Value}; +use crate::interop::{serde_to_value, Value}; use super::super::error::{ErrorKind, OpError}; use super::expect_str_value; @@ -187,7 +187,7 @@ pub(super) fn json_decode(op: &'static str, value: Value) -> Result Result #[cfg(test)] mod tests { use super::is_empty; - use crate::data::Value; + use crate::interop::Value; use crate::ops::ErrorKind; #[test] diff --git a/src/ops/apply/map.rs b/src/ops/apply/map.rs index 07719d4..128d145 100644 --- a/src/ops/apply/map.rs +++ b/src/ops/apply/map.rs @@ -1,4 +1,4 @@ -use crate::data::Value; +use crate::interop::Value; use super::super::error::{ErrorKind, OpError, PathItem}; use super::expect_map_value; diff --git a/src/ops/apply/mod.rs b/src/ops/apply/mod.rs index 09b3610..0253d98 100644 --- a/src/ops/apply/mod.rs +++ b/src/ops/apply/mod.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use crate::data::Value; +use crate::interop::Value; use super::error::{ErrorKind, OpError}; use super::kind::OperatorKind; diff --git a/src/ops/apply/seq.rs b/src/ops/apply/seq.rs index 568f023..9c3e7e2 100644 --- a/src/ops/apply/seq.rs +++ b/src/ops/apply/seq.rs @@ -1,4 +1,4 @@ -use crate::data::Value; +use crate::interop::Value; use super::super::error::{ErrorKind, OpError, PathItem}; use super::expect_list_value; @@ -66,7 +66,7 @@ pub(super) fn last(op: &'static str, value: Value) -> Result { #[cfg(test)] mod tests { use super::{first, last, slice}; - use crate::data::Value; + use crate::interop::Value; use crate::ops::ErrorKind; #[test] diff --git a/src/ops/apply/text.rs b/src/ops/apply/text.rs index 2d1aded..b4caa2d 100644 --- a/src/ops/apply/text.rs +++ b/src/ops/apply/text.rs @@ -1,4 +1,4 @@ -use crate::data::Value; +use crate::interop::Value; use super::super::error::{ErrorKind, OpError}; use super::expect_str_value; diff --git a/src/py/blueprint.rs b/src/py/blueprint.rs index 56e5d7d..d4b330e 100644 --- a/src/py/blueprint.rs +++ b/src/py/blueprint.rs @@ -1,7 +1,7 @@ use super::error::{ErrorKind, RopustError}; use super::operator::Operator; use super::result::{err, ok, ResultObj}; -use crate::data::{py_to_value, serde_to_value, value_to_py, Value}; +use crate::interop::{py_to_value, serde_to_value, value_to_py, Value}; use crate::ops::PathItem; use crate::ops::{apply, OpError, OperatorKind}; use pyo3::prelude::*;