From 19ed89aa0a22bf66d9066c69d7ce84f061e9ca2b Mon Sep 17 00:00:00 2001 From: Kazuhiko Kikuchi Date: Thu, 16 Jun 2022 07:45:44 +0900 Subject: [PATCH] update use --- springql/examples/doc_app1.rs | 2 +- springql/examples/doc_app2.rs | 2 +- springql/examples/in_vehicle_pipeline.rs | 2 +- springql/tests/e2e_high_level_rs.rs | 2 +- springql/tests/e2e_sampling.rs | 2 +- springql/tests/feat_aggregation.rs | 2 +- springql/tests/feat_error.rs | 2 +- springql/tests/feat_join.rs | 2 +- springql/tests/feat_logical_ops.rs | 2 +- springql/tests/feat_numerical_ops.rs | 2 +- springql/tests/feat_performance_metrics_report.rs | 2 +- springql/tests/feat_pipeline.rs | 2 +- springql/tests/feat_projection.rs | 2 +- springql/tests/feat_purger.rs | 2 +- springql/tests/feat_spring_open_twice.rs | 2 +- springql/tests/feat_timestamp_ops.rs | 2 +- springql/tests/feat_worker_config.rs | 2 +- springql/tests/test_support/mod.rs | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/springql/examples/doc_app1.rs b/springql/examples/doc_app1.rs index d65041f9..7f97d4f8 100644 --- a/springql/examples/doc_app1.rs +++ b/springql/examples/doc_app1.rs @@ -12,7 +12,7 @@ //! echo '{"ts": "2022-01-01 13:00:00.000000000", "temperature": 5.3}' |nc localhost 54300 //! ``` -use springql_core::api::{SpringConfig, SpringPipeline}; +use springql::{SpringConfig, SpringPipeline}; fn main() { const SOURCE_PORT: u16 = 54300; diff --git a/springql/examples/doc_app2.rs b/springql/examples/doc_app2.rs index 86b4b764..54f8ed2b 100644 --- a/springql/examples/doc_app2.rs +++ b/springql/examples/doc_app2.rs @@ -19,7 +19,7 @@ use std::{sync::Arc, thread, time::Duration}; -use springql_core::api::{SpringConfig, SpringPipeline}; +use springql::{SpringConfig, SpringPipeline}; fn main() { const SOURCE_PORT: u16 = 54300; diff --git a/springql/examples/in_vehicle_pipeline.rs b/springql/examples/in_vehicle_pipeline.rs index 7f8aff55..44ed4aec 100644 --- a/springql/examples/in_vehicle_pipeline.rs +++ b/springql/examples/in_vehicle_pipeline.rs @@ -7,7 +7,7 @@ use std::{ time::Duration, }; -use springql_core::api::{SpringConfig, SpringPipeline}; +use springql::{SpringConfig, SpringPipeline}; use springql_foreign_service::sink::ForeignSink; use tempfile::NamedTempFile; diff --git a/springql/tests/e2e_high_level_rs.rs b/springql/tests/e2e_high_level_rs.rs index c8911fb3..2a3da426 100644 --- a/springql/tests/e2e_high_level_rs.rs +++ b/springql/tests/e2e_high_level_rs.rs @@ -5,7 +5,7 @@ mod test_support; use pretty_assertions::assert_eq; use serde_json::json; -use springql_core::api::{error::Result, SpringConfig}; +use springql::{Result, SpringConfig}; use springql_foreign_service::{ sink::ForeignSink, source::{ForeignSource, ForeignSourceInput}, diff --git a/springql/tests/e2e_sampling.rs b/springql/tests/e2e_sampling.rs index 86ff3585..9aa8c408 100644 --- a/springql/tests/e2e_sampling.rs +++ b/springql/tests/e2e_sampling.rs @@ -4,7 +4,7 @@ mod test_support; use pretty_assertions::assert_eq; use serde_json::json; -use springql_core::api::{error::Result, *}; +use springql::*; use springql_foreign_service::{ sink::ForeignSink, source::{ForeignSource, ForeignSourceInput}, diff --git a/springql/tests/feat_aggregation.rs b/springql/tests/feat_aggregation.rs index 6bff229c..9d9310c1 100644 --- a/springql/tests/feat_aggregation.rs +++ b/springql/tests/feat_aggregation.rs @@ -4,7 +4,7 @@ mod test_support; use pretty_assertions::assert_eq; use serde_json::json; -use springql_core::api::{error::Result, *}; +use springql::*; use springql_foreign_service::{ sink::ForeignSink, source::{ForeignSource, ForeignSourceInput}, diff --git a/springql/tests/feat_error.rs b/springql/tests/feat_error.rs index 26b7bfab..dee125f0 100644 --- a/springql/tests/feat_error.rs +++ b/springql/tests/feat_error.rs @@ -1,6 +1,6 @@ // This file is part of https://github.com/SpringQL/SpringQL which is licensed under MIT OR Apache-2.0. See file LICENSE-MIT or LICENSE-APACHE for full license details. -use springql_core::api::error::SpringError; +use springql::SpringError; // https://rust-lang.github.io/api-guidelines/interoperability.html#error-types-are-meaningful-and-well-behaved-c-good-err #[test] diff --git a/springql/tests/feat_join.rs b/springql/tests/feat_join.rs index 1fd3d4d0..4facb84a 100644 --- a/springql/tests/feat_join.rs +++ b/springql/tests/feat_join.rs @@ -4,7 +4,7 @@ mod test_support; use pretty_assertions::assert_eq; use serde_json::json; -use springql_core::api::*; +use springql::*; use springql_foreign_service::{ sink::ForeignSink, source::{ForeignSource, ForeignSourceInput}, diff --git a/springql/tests/feat_logical_ops.rs b/springql/tests/feat_logical_ops.rs index ed27a181..2ab0e35b 100644 --- a/springql/tests/feat_logical_ops.rs +++ b/springql/tests/feat_logical_ops.rs @@ -4,7 +4,7 @@ mod test_support; use pretty_assertions::assert_eq; use serde_json::json; -use springql_core::api::*; +use springql::*; use springql_foreign_service::{ sink::ForeignSink, source::{ForeignSource, ForeignSourceInput}, diff --git a/springql/tests/feat_numerical_ops.rs b/springql/tests/feat_numerical_ops.rs index 9f72f017..1d37a82e 100644 --- a/springql/tests/feat_numerical_ops.rs +++ b/springql/tests/feat_numerical_ops.rs @@ -5,7 +5,7 @@ mod test_support; use float_cmp::approx_eq; use pretty_assertions::assert_eq; use serde_json::json; -use springql_core::api::*; +use springql::*; use springql_foreign_service::{ sink::ForeignSink, source::{ForeignSource, ForeignSourceInput}, diff --git a/springql/tests/feat_performance_metrics_report.rs b/springql/tests/feat_performance_metrics_report.rs index 7e672164..6dab325f 100644 --- a/springql/tests/feat_performance_metrics_report.rs +++ b/springql/tests/feat_performance_metrics_report.rs @@ -9,7 +9,7 @@ use float_cmp::approx_eq; use pretty_assertions::assert_eq; use rand::prelude::{IteratorRandom, SliceRandom}; use serde_json::json; -use springql_core::api::*; +use springql::*; use springql_foreign_service::{ sink::ForeignSink, source::{ForeignSource, ForeignSourceInput}, diff --git a/springql/tests/feat_pipeline.rs b/springql/tests/feat_pipeline.rs index ce126ec5..bb1c6e46 100644 --- a/springql/tests/feat_pipeline.rs +++ b/springql/tests/feat_pipeline.rs @@ -4,7 +4,7 @@ mod test_support; use pretty_assertions::assert_eq; use serde_json::json; -use springql_core::api::*; +use springql::*; use springql_foreign_service::source::{ForeignSource, ForeignSourceInput}; use springql_test_logger::setup_test_logger; diff --git a/springql/tests/feat_projection.rs b/springql/tests/feat_projection.rs index a0b15f0f..e7ebe976 100644 --- a/springql/tests/feat_projection.rs +++ b/springql/tests/feat_projection.rs @@ -4,7 +4,7 @@ mod test_support; use pretty_assertions::assert_eq; use serde_json::json; -use springql_core::api::*; +use springql::*; use springql_foreign_service::source::{ForeignSource, ForeignSourceInput}; use springql_test_logger::setup_test_logger; diff --git a/springql/tests/feat_purger.rs b/springql/tests/feat_purger.rs index e3096547..e992185b 100644 --- a/springql/tests/feat_purger.rs +++ b/springql/tests/feat_purger.rs @@ -7,7 +7,7 @@ use std::time::Duration; use log::LevelFilter; use serde_json::json; -use springql_core::api::*; +use springql::*; use springql_foreign_service::{ sink::ForeignSink, source::{ForeignSource, ForeignSourceInput}, diff --git a/springql/tests/feat_spring_open_twice.rs b/springql/tests/feat_spring_open_twice.rs index 9f1070d5..d04aea31 100644 --- a/springql/tests/feat_spring_open_twice.rs +++ b/springql/tests/feat_spring_open_twice.rs @@ -1,6 +1,6 @@ // This file is part of https://github.com/SpringQL/SpringQL which is licensed under MIT OR Apache-2.0. See file LICENSE-MIT or LICENSE-APACHE for full license details. -use springql_core::api::{SpringConfig, SpringPipeline}; +use springql::{SpringConfig, SpringPipeline}; #[test] fn test_spring_open_twice() { diff --git a/springql/tests/feat_timestamp_ops.rs b/springql/tests/feat_timestamp_ops.rs index 829ff6f3..77256010 100644 --- a/springql/tests/feat_timestamp_ops.rs +++ b/springql/tests/feat_timestamp_ops.rs @@ -4,7 +4,7 @@ mod test_support; use pretty_assertions::assert_eq; use serde_json::json; -use springql_core::api::*; +use springql::*; use springql_foreign_service::{ sink::ForeignSink, source::{ForeignSource, ForeignSourceInput}, diff --git a/springql/tests/feat_worker_config.rs b/springql/tests/feat_worker_config.rs index e7b5cfc2..633ef89b 100644 --- a/springql/tests/feat_worker_config.rs +++ b/springql/tests/feat_worker_config.rs @@ -4,7 +4,7 @@ mod test_support; use crate::test_support::{apply_ddls, drain_from_sink}; use serde_json::json; -use springql_core::api::*; +use springql::*; use springql_foreign_service::{ sink::ForeignSink, source::{ForeignSource, ForeignSourceInput}, diff --git a/springql/tests/test_support/mod.rs b/springql/tests/test_support/mod.rs index 92743541..eacbd89c 100644 --- a/springql/tests/test_support/mod.rs +++ b/springql/tests/test_support/mod.rs @@ -2,7 +2,7 @@ use std::time::Duration; -use springql_core::{api::SpringConfig, api::SpringPipeline}; +use springql::{SpringConfig, SpringPipeline}; use springql_foreign_service::sink::ForeignSink; #[allow(dead_code)]