refactor: use canonical Rust module paths (#4269)

crates/heal/tests/endpoint_index_test.rs

@@ -18,11 +18,9 @@ use std::net::SocketAddr;
 use tempfile::TempDir;
 use tokio_util::sync::CancellationToken;
 
-#[path = "endpoint_index_test/storage_api.rs"]
 mod storage_api;
 
 use storage_api::endpoint_index::{ECStore, Endpoint, EndpointServerPools, Endpoints, PoolEndpoints, init_local_disks};
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn test_endpoint_index_settings() -> rustfs_heal::Result<()> {
     let temp_dir = TempDir::new()?;

crates/heal/tests/endpoint_index_test/storage_api.rs

@@ -1,21 +0,0 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub(crate) use rustfs_ecstore::api::disk::endpoint::Endpoint;
-pub(crate) use rustfs_ecstore::api::layout::{EndpointServerPools, Endpoints, PoolEndpoints};
-pub(crate) use rustfs_ecstore::api::storage::{ECStore, init_local_disks};
-
-pub(crate) mod endpoint_index {
-    pub(crate) use super::{ECStore, Endpoint, EndpointServerPools, Endpoints, PoolEndpoints, init_local_disks};
-}

crates/heal/tests/heal_bug_fixes_test.rs

@@ -18,7 +18,6 @@ use rustfs_heal::heal::{
     utils,
 };
 
-#[path = "heal_bug_fixes_test/storage_api.rs"]
 mod storage_api;
 
 use storage_api::bug_fixes::{BucketInfo, DiskStore, Endpoint};

crates/heal/tests/heal_bug_fixes_test/storage_api.rs

@@ -1,21 +0,0 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub(crate) use rustfs_ecstore::api::disk::{DiskStore, endpoint::Endpoint};
-use rustfs_storage_api as storage_contracts;
-
-pub(crate) mod bug_fixes {
-    pub(crate) use super::storage_contracts::BucketInfo;
-    pub(crate) use super::{DiskStore, Endpoint};
-}

crates/heal/tests/heal_integration_test.rs

@@ -30,7 +30,6 @@ use tokio_util::sync::CancellationToken;
 use tracing::info;
 use walkdir::WalkDir;
 
-#[path = "heal_integration_test/storage_api.rs"]
 mod storage_api;
 
 use storage_api::integration::{

crates/heal/tests/heal_integration_test/storage_api.rs

@@ -1,27 +0,0 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub(crate) use rustfs_ecstore::api::bucket::metadata_sys::init_bucket_metadata_sys;
-pub(crate) use rustfs_ecstore::api::disk::endpoint::Endpoint;
-pub(crate) use rustfs_ecstore::api::layout::{EndpointServerPools, Endpoints, PoolEndpoints};
-pub(crate) use rustfs_ecstore::api::storage::{ECStore, init_local_disks};
-use rustfs_storage_api as storage_contracts;
-
-pub(crate) mod integration {
-    pub(crate) use super::storage_contracts::{BucketOperations, BucketOptions, ObjectIO, ObjectOperations};
-
-    pub(crate) use super::{
-        ECStore, Endpoint, EndpointServerPools, Endpoints, PoolEndpoints, init_bucket_metadata_sys, init_local_disks,
-    };
-}

crates/heal/tests/storage_api.rs

@@ -0,0 +1,31 @@
+#[allow(unused_imports)]
+pub(crate) mod bug_fixes {
+    pub(crate) use rustfs_ecstore::api::disk::DiskStore;
+    pub(crate) use rustfs_ecstore::api::disk::endpoint::Endpoint;
+    pub(crate) use rustfs_storage_api::BucketInfo;
+}
+
+#[allow(unused_imports)]
+pub(crate) mod endpoint_index {
+    pub(crate) use rustfs_ecstore::api::disk::endpoint::Endpoint;
+    pub(crate) use rustfs_ecstore::api::layout::EndpointServerPools;
+    pub(crate) use rustfs_ecstore::api::layout::Endpoints;
+    pub(crate) use rustfs_ecstore::api::layout::PoolEndpoints;
+    pub(crate) use rustfs_ecstore::api::storage::ECStore;
+    pub(crate) use rustfs_ecstore::api::storage::init_local_disks;
+}
+
+#[allow(unused_imports)]
+pub(crate) mod integration {
+    pub(crate) use rustfs_ecstore::api::bucket::metadata_sys::init_bucket_metadata_sys;
+    pub(crate) use rustfs_ecstore::api::disk::endpoint::Endpoint;
+    pub(crate) use rustfs_ecstore::api::layout::EndpointServerPools;
+    pub(crate) use rustfs_ecstore::api::layout::Endpoints;
+    pub(crate) use rustfs_ecstore::api::layout::PoolEndpoints;
+    pub(crate) use rustfs_ecstore::api::storage::ECStore;
+    pub(crate) use rustfs_ecstore::api::storage::init_local_disks;
+    pub(crate) use rustfs_storage_api::BucketOperations;
+    pub(crate) use rustfs_storage_api::BucketOptions;
+    pub(crate) use rustfs_storage_api::ObjectIO;
+    pub(crate) use rustfs_storage_api::ObjectOperations;
+}