Merge pull request #126 from cpmech/simplify-pub-use-crate

Replace use crate::something with use something

russell_lab/Cargo.toml

@@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] }
 
 [dev-dependencies]
 criterion = "0.5"
-plotpy = "1.1"
+plotpy = "1.9"
 serde_json = "1.0"
 serial_test = "3.0"
 

russell_lab/src/algo/mod.rs

@@ -11,13 +11,14 @@ mod quadrature;
 mod root_finder;
 mod root_finder_brent;
 mod testing;
-pub use crate::algo::common::*;
-pub use crate::algo::interp_chebyshev::*;
-pub use crate::algo::interp_lagrange::*;
-pub use crate::algo::linear_fitting::*;
-pub use crate::algo::min_bracketing::*;
-pub use crate::algo::min_solver::*;
-pub use crate::algo::num_jacobian::*;
-pub use crate::algo::quadrature::*;
-pub use crate::algo::root_finder::*;
-pub use crate::algo::testing::*;
+
+pub use common::*;
+pub use interp_chebyshev::*;
+pub use interp_lagrange::*;
+pub use linear_fitting::*;
+pub use min_bracketing::*;
+pub use min_solver::*;
+pub use num_jacobian::*;
+pub use quadrature::*;
+pub use root_finder::*;
+pub use testing::*;

russell_lab/src/base/mod.rs

@@ -9,11 +9,12 @@ mod macros;
 mod read_table;
 mod sort;
 mod stopwatch;
-pub use crate::base::as_array::*;
-pub use crate::base::auxiliary_blas::*;
-pub use crate::base::enums::*;
-pub use crate::base::formatters::*;
-pub use crate::base::generators::*;
-pub use crate::base::read_table::*;
-pub use crate::base::sort::*;
-pub use crate::base::stopwatch::*;
+
+pub use as_array::*;
+pub use auxiliary_blas::*;
+pub use enums::*;
+pub use formatters::*;
+pub use generators::*;
+pub use read_table::*;
+pub use sort::*;
+pub use stopwatch::*;

russell_lab/src/check/mod.rs

@@ -105,20 +105,21 @@ mod deriv2_backward;
 mod deriv2_central;
 mod deriv2_forward;
 mod testing;
-pub use crate::check::approx_eq::*;
-pub use crate::check::array_approx_eq::*;
-pub use crate::check::assert_alike::*;
-pub use crate::check::complex_approx_eq::*;
-pub use crate::check::complex_array_approx_eq::*;
-pub use crate::check::deriv1_approx_eq::*;
-pub use crate::check::deriv1_approx_eq_bw::*;
-pub use crate::check::deriv1_approx_eq_fw::*;
-pub use crate::check::deriv1_backward::*;
-pub use crate::check::deriv1_central::*;
-pub use crate::check::deriv1_forward::*;
-pub use crate::check::deriv2_approx_eq::*;
-pub use crate::check::deriv2_approx_eq_bw::*;
-pub use crate::check::deriv2_approx_eq_fw::*;
-pub use crate::check::deriv2_backward::*;
-pub use crate::check::deriv2_central::*;
-pub use crate::check::deriv2_forward::*;
+
+pub use approx_eq::*;
+pub use array_approx_eq::*;
+pub use assert_alike::*;
+pub use complex_approx_eq::*;
+pub use complex_array_approx_eq::*;
+pub use deriv1_approx_eq::*;
+pub use deriv1_approx_eq_bw::*;
+pub use deriv1_approx_eq_fw::*;
+pub use deriv1_backward::*;
+pub use deriv1_central::*;
+pub use deriv1_forward::*;
+pub use deriv2_approx_eq::*;
+pub use deriv2_approx_eq_bw::*;
+pub use deriv2_approx_eq_fw::*;
+pub use deriv2_backward::*;
+pub use deriv2_central::*;
+pub use deriv2_forward::*;

russell_lab/src/lib.rs

@@ -154,13 +154,14 @@ pub mod math;
 pub mod matrix;
 pub mod matvec;
 pub mod vector;
-pub use crate::algo::*;
-pub use crate::base::*;
-pub use crate::check::*;
-use crate::internal::*;
-pub use crate::matrix::*;
-pub use crate::matvec::*;
-pub use crate::vector::*;
+
+pub use algo::*;
+pub use base::*;
+pub use check::*;
+use internal::*;
+pub use matrix::*;
+pub use matvec::*;
+pub use vector::*;
 
 // run code from README file
 #[doc = include_str!("../README.md")]

russell_lab/src/math/mod.rs

@@ -16,19 +16,20 @@ mod functions;
 mod gamma;
 mod ln_gamma;
 mod modulo;
-pub use crate::math::bessel_0::*;
-pub use crate::math::bessel_1::*;
-pub use crate::math::bessel_mod::*;
-pub use crate::math::bessel_n::*;
-pub use crate::math::beta::*;
-pub use crate::math::chebyshev::*;
-pub use crate::math::complex::*;
-pub use crate::math::composition::*;
-pub use crate::math::constants::*;
-pub use crate::math::elliptic::*;
-pub use crate::math::erf::*;
-pub use crate::math::erf_inv::*;
-pub use crate::math::functions::*;
-pub use crate::math::gamma::*;
-pub use crate::math::ln_gamma::*;
-pub use crate::math::modulo::*;
+
+pub use bessel_0::*;
+pub use bessel_1::*;
+pub use bessel_mod::*;
+pub use bessel_n::*;
+pub use beta::*;
+pub use chebyshev::*;
+pub use complex::*;
+pub use composition::*;
+pub use constants::*;
+pub use elliptic::*;
+pub use erf::*;
+pub use erf_inv::*;
+pub use functions::*;
+pub use gamma::*;
+pub use ln_gamma::*;
+pub use modulo::*;

russell_lab/src/matrix/mod.rs

@@ -42,44 +42,45 @@ mod mat_update;
 mod mat_write_vismatrix;
 mod num_matrix;
 mod testing;
-pub use crate::matrix::aliases::*;
-pub use crate::matrix::complex_mat_add::*;
-pub use crate::matrix::complex_mat_approx_eq::*;
-pub use crate::matrix::complex_mat_cholesky::*;
-pub use crate::matrix::complex_mat_copy::*;
-pub use crate::matrix::complex_mat_eigen::*;
-pub use crate::matrix::complex_mat_eigen_herm::*;
-pub use crate::matrix::complex_mat_gen_eigen::*;
-pub use crate::matrix::complex_mat_herm_rank_op::*;
-pub use crate::matrix::complex_mat_inverse::*;
-pub use crate::matrix::complex_mat_mat_mul::*;
-pub use crate::matrix::complex_mat_norm::*;
-pub use crate::matrix::complex_mat_scale::*;
-pub use crate::matrix::complex_mat_svd::*;
-pub use crate::matrix::complex_mat_sym_rank_op::*;
-pub use crate::matrix::complex_mat_t_mat_mul::*;
-pub use crate::matrix::complex_mat_unzip::*;
-pub use crate::matrix::complex_mat_update::*;
-pub use crate::matrix::complex_mat_zip::*;
-pub use crate::matrix::mat_add::*;
-pub use crate::matrix::mat_approx_eq::*;
-pub use crate::matrix::mat_cholesky::*;
-pub use crate::matrix::mat_convert_to_blas_band::*;
-pub use crate::matrix::mat_copy::*;
-pub use crate::matrix::mat_eigen::*;
-pub use crate::matrix::mat_eigen_sym::*;
-pub use crate::matrix::mat_eigen_sym_jacobi::*;
-pub use crate::matrix::mat_eigenvalues::*;
-pub use crate::matrix::mat_gen_eigen::*;
-pub use crate::matrix::mat_inverse::*;
-pub use crate::matrix::mat_mat_mul::*;
-pub use crate::matrix::mat_max_abs_diff::*;
-pub use crate::matrix::mat_norm::*;
-pub use crate::matrix::mat_pseudo_inverse::*;
-pub use crate::matrix::mat_scale::*;
-pub use crate::matrix::mat_svd::*;
-pub use crate::matrix::mat_sym_rank_op::*;
-pub use crate::matrix::mat_t_mat_mul::*;
-pub use crate::matrix::mat_update::*;
-pub use crate::matrix::mat_write_vismatrix::*;
-pub use crate::matrix::num_matrix::*;
+
+pub use aliases::*;
+pub use complex_mat_add::*;
+pub use complex_mat_approx_eq::*;
+pub use complex_mat_cholesky::*;
+pub use complex_mat_copy::*;
+pub use complex_mat_eigen::*;
+pub use complex_mat_eigen_herm::*;
+pub use complex_mat_gen_eigen::*;
+pub use complex_mat_herm_rank_op::*;
+pub use complex_mat_inverse::*;
+pub use complex_mat_mat_mul::*;
+pub use complex_mat_norm::*;
+pub use complex_mat_scale::*;
+pub use complex_mat_svd::*;
+pub use complex_mat_sym_rank_op::*;
+pub use complex_mat_t_mat_mul::*;
+pub use complex_mat_unzip::*;
+pub use complex_mat_update::*;
+pub use complex_mat_zip::*;
+pub use mat_add::*;
+pub use mat_approx_eq::*;
+pub use mat_cholesky::*;
+pub use mat_convert_to_blas_band::*;
+pub use mat_copy::*;
+pub use mat_eigen::*;
+pub use mat_eigen_sym::*;
+pub use mat_eigen_sym_jacobi::*;
+pub use mat_eigenvalues::*;
+pub use mat_gen_eigen::*;
+pub use mat_inverse::*;
+pub use mat_mat_mul::*;
+pub use mat_max_abs_diff::*;
+pub use mat_norm::*;
+pub use mat_pseudo_inverse::*;
+pub use mat_scale::*;
+pub use mat_svd::*;
+pub use mat_sym_rank_op::*;
+pub use mat_t_mat_mul::*;
+pub use mat_update::*;
+pub use mat_write_vismatrix::*;
+pub use num_matrix::*;

russell_lab/src/matvec/mod.rs

@@ -11,14 +11,15 @@ mod solve_lin_sys;
 mod vec_mat_mul;
 mod vec_outer;
 mod vec_outer_update;
-pub use crate::matvec::complex_mat_vec_mul::*;
-pub use crate::matvec::complex_solve_lin_sys::*;
-pub use crate::matvec::complex_vec_mat_mul::*;
-pub use crate::matvec::mat_sum_cols::*;
-pub use crate::matvec::mat_sum_rows::*;
-pub use crate::matvec::mat_vec_mul::*;
-pub use crate::matvec::mat_vec_mul_update::*;
-pub use crate::matvec::solve_lin_sys::*;
-pub use crate::matvec::vec_mat_mul::*;
-pub use crate::matvec::vec_outer::*;
-pub use crate::matvec::vec_outer_update::*;
+
+pub use complex_mat_vec_mul::*;
+pub use complex_solve_lin_sys::*;
+pub use complex_vec_mat_mul::*;
+pub use mat_sum_cols::*;
+pub use mat_sum_rows::*;
+pub use mat_vec_mul::*;
+pub use mat_vec_mul_update::*;
+pub use solve_lin_sys::*;
+pub use vec_mat_mul::*;
+pub use vec_outer::*;
+pub use vec_outer_update::*;

russell_lab/src/vector/mod.rs

@@ -22,25 +22,26 @@ mod vec_norm;
 mod vec_rms_scaled;
 mod vec_scale;
 mod vec_update;
-pub use crate::vector::aliases::*;
-pub use crate::vector::complex_vec_add::*;
-pub use crate::vector::complex_vec_approx_eq::*;
-pub use crate::vector::complex_vec_copy::*;
-pub use crate::vector::complex_vec_norm::*;
-pub use crate::vector::complex_vec_scale::*;
-pub use crate::vector::complex_vec_unzip::*;
-pub use crate::vector::complex_vec_update::*;
-pub use crate::vector::complex_vec_zip::*;
-pub use crate::vector::num_vector::*;
-pub use crate::vector::vec_add::*;
-pub use crate::vector::vec_all_finite::*;
-pub use crate::vector::vec_approx_eq::*;
-pub use crate::vector::vec_copy::*;
-pub use crate::vector::vec_fmt_scientific::*;
-pub use crate::vector::vec_inner::*;
-pub use crate::vector::vec_max_abs_diff::*;
-pub use crate::vector::vec_max_scaled::*;
-pub use crate::vector::vec_norm::*;
-pub use crate::vector::vec_rms_scaled::*;
-pub use crate::vector::vec_scale::*;
-pub use crate::vector::vec_update::*;
+
+pub use aliases::*;
+pub use complex_vec_add::*;
+pub use complex_vec_approx_eq::*;
+pub use complex_vec_copy::*;
+pub use complex_vec_norm::*;
+pub use complex_vec_scale::*;
+pub use complex_vec_unzip::*;
+pub use complex_vec_update::*;
+pub use complex_vec_zip::*;
+pub use num_vector::*;
+pub use vec_add::*;
+pub use vec_all_finite::*;
+pub use vec_approx_eq::*;
+pub use vec_copy::*;
+pub use vec_fmt_scientific::*;
+pub use vec_inner::*;
+pub use vec_max_abs_diff::*;
+pub use vec_max_scaled::*;
+pub use vec_norm::*;
+pub use vec_rms_scaled::*;
+pub use vec_scale::*;
+pub use vec_update::*;

russell_ode/Cargo.toml

@@ -24,6 +24,6 @@ serde_json = "1.0"
 structopt = "0.3"
 
 [dev-dependencies]
-plotpy = "1.1"
+plotpy = "1.9"
 rayon = "1.10"
 serial_test = "3.0"

russell_ode/src/lib.rs

@@ -208,23 +208,24 @@ mod samples;
 mod stats;
 mod system;
 mod workspace;
-pub use crate::constants::*;
-use crate::detect_stiffness::*;
-pub use crate::enums::*;
-use crate::erk_dense_out::*;
-use crate::euler_backward::*;
-use crate::euler_forward::*;
-use crate::explicit_runge_kutta::*;
-pub use crate::ode_solver::*;
-use crate::ode_solver_trait::*;
-pub use crate::output::*;
-pub use crate::params::*;
-pub use crate::pde_discrete_laplacian_2d::*;
-use crate::radau5::*;
-pub use crate::samples::*;
-pub use crate::stats::*;
-pub use crate::system::*;
-use crate::workspace::*;
+
+pub use constants::*;
+use detect_stiffness::*;
+pub use enums::*;
+use erk_dense_out::*;
+use euler_backward::*;
+use euler_forward::*;
+use explicit_runge_kutta::*;
+pub use ode_solver::*;
+use ode_solver_trait::*;
+pub use output::*;
+pub use params::*;
+pub use pde_discrete_laplacian_2d::*;
+use radau5::*;
+pub use samples::*;
+pub use stats::*;
+pub use system::*;
+use workspace::*;
 
 // run code from README file
 #[doc = include_str!("../README.md")]