Skip to content

Commit 8eedfe5

Browse files
authored
Chore: Use full item paths for every import is vortex-vector (#5509)
Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>
1 parent 4d10a60 commit 8eedfe5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+378
-150
lines changed

vortex-vector/src/binaryview/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ pub use vector_mut::*;
1515
pub use view::*;
1616
use vortex_error::vortex_panic;
1717

18-
use crate::{Vector, VectorMut};
18+
use crate::Vector;
19+
use crate::VectorMut;
1920

2021
mod scalar;
2122
mod types;

vortex-vector/src/binaryview/scalar.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// SPDX-FileCopyrightText: Copyright the Vortex contributors
33

4-
use crate::binaryview::{
5-
BinaryType, BinaryViewType, BinaryViewTypeUpcast, BinaryViewVectorMut, StringType,
6-
};
7-
use crate::{Scalar, ScalarOps, VectorMutOps};
4+
use crate::Scalar;
5+
use crate::ScalarOps;
6+
use crate::VectorMutOps;
7+
use crate::binaryview::BinaryType;
8+
use crate::binaryview::BinaryViewType;
9+
use crate::binaryview::BinaryViewTypeUpcast;
10+
use crate::binaryview::BinaryViewVectorMut;
11+
use crate::binaryview::StringType;
812

913
/// A scalar value for types that implement [`BinaryViewType`].
1014
#[derive(Debug)]

vortex-vector/src/binaryview/types.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@
55
66
use std::fmt::Debug;
77

8-
use vortex_buffer::{BufferString, ByteBuffer};
8+
use vortex_buffer::BufferString;
9+
use vortex_buffer::ByteBuffer;
910

10-
use crate::binaryview::{BinaryViewVector, BinaryViewVectorMut};
11-
use crate::{Vector, VectorMut};
11+
use crate::Vector;
12+
use crate::VectorMut;
13+
use crate::binaryview::BinaryViewVector;
14+
use crate::binaryview::BinaryViewVectorMut;
1215

1316
impl<T: BinaryViewType> From<BinaryViewVector<T>> for Vector {
1417
fn from(value: BinaryViewVector<T>) -> Self {

vortex-vector/src/binaryview/vector.rs

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,20 @@ use std::fmt::Debug;
77
use std::ops::RangeBounds;
88
use std::sync::Arc;
99

10-
use vortex_buffer::{Alignment, Buffer, ByteBuffer};
11-
use vortex_error::{VortexExpect, VortexResult, vortex_ensure};
10+
use vortex_buffer::Alignment;
11+
use vortex_buffer::Buffer;
12+
use vortex_buffer::ByteBuffer;
13+
use vortex_error::VortexExpect;
14+
use vortex_error::VortexResult;
15+
use vortex_error::vortex_ensure;
1216
use vortex_mask::Mask;
1317

1418
use crate::VectorOps;
19+
use crate::binaryview::BinaryViewScalar;
20+
use crate::binaryview::BinaryViewType;
1521
use crate::binaryview::vector_mut::BinaryViewVectorMut;
16-
use crate::binaryview::view::{BinaryView, validate_views};
17-
use crate::binaryview::{BinaryViewScalar, BinaryViewType};
22+
use crate::binaryview::view::BinaryView;
23+
use crate::binaryview::view::validate_views;
1824

1925
/// A variable-length binary vector.
2026
///
@@ -282,12 +288,15 @@ impl<T: BinaryViewType> VectorOps for BinaryViewVector<T> {
282288
mod tests {
283289
use std::sync::Arc;
284290

285-
use vortex_buffer::{ByteBuffer, buffer};
291+
use vortex_buffer::ByteBuffer;
292+
use vortex_buffer::buffer;
286293
use vortex_mask::Mask;
287294

295+
use crate::VectorMutOps;
296+
use crate::VectorOps;
297+
use crate::binaryview::StringVector;
298+
use crate::binaryview::StringVectorMut;
288299
use crate::binaryview::view::BinaryView;
289-
use crate::binaryview::{StringVector, StringVectorMut};
290-
use crate::{VectorMutOps, VectorOps};
291300

292301
#[test]
293302
#[should_panic(expected = "views buffer length 1 != validity length 100")]

vortex-vector/src/binaryview/vector_mut.rs

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,21 @@
55
66
use std::sync::Arc;
77

8-
use vortex_buffer::{BufferMut, ByteBuffer, ByteBufferMut};
9-
use vortex_error::{VortexExpect, VortexResult, vortex_ensure};
8+
use vortex_buffer::BufferMut;
9+
use vortex_buffer::ByteBuffer;
10+
use vortex_buffer::ByteBufferMut;
11+
use vortex_error::VortexExpect;
12+
use vortex_error::VortexResult;
13+
use vortex_error::vortex_ensure;
1014
use vortex_mask::MaskMut;
1115

16+
use crate::VectorMutOps;
17+
use crate::VectorOps;
18+
use crate::binaryview::BinaryViewScalar;
19+
use crate::binaryview::BinaryViewType;
1220
use crate::binaryview::vector::BinaryViewVector;
13-
use crate::binaryview::view::{BinaryView, validate_views};
14-
use crate::binaryview::{BinaryViewScalar, BinaryViewType};
15-
use crate::{VectorMutOps, VectorOps};
21+
use crate::binaryview::view::BinaryView;
22+
use crate::binaryview::view::validate_views;
1623

1724
// Default capacity for new string data buffers of 2MiB.
1825
const BUFFER_CAPACITY: usize = 2 * 1024 * 1024;
@@ -310,12 +317,17 @@ mod tests {
310317
use std::ops::Deref;
311318
use std::sync::Arc;
312319

313-
use vortex_buffer::{ByteBuffer, buffer, buffer_mut};
314-
use vortex_mask::{Mask, MaskMut};
320+
use vortex_buffer::ByteBuffer;
321+
use vortex_buffer::buffer;
322+
use vortex_buffer::buffer_mut;
323+
use vortex_mask::Mask;
324+
use vortex_mask::MaskMut;
315325

326+
use crate::VectorMutOps;
327+
use crate::VectorOps;
328+
use crate::binaryview::StringVector;
329+
use crate::binaryview::StringVectorMut;
316330
use crate::binaryview::view::BinaryView;
317-
use crate::binaryview::{StringVector, StringVectorMut};
318-
use crate::{VectorMutOps, VectorOps};
319331

320332
#[test]
321333
fn test_basic() {

vortex-vector/src/binaryview/view.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,17 @@
44
//! The 16-byte view struct stored in variable-length binary vectors.
55
66
use std::fmt;
7-
use std::hash::{Hash, Hasher};
7+
use std::hash::Hash;
8+
use std::hash::Hasher;
89
use std::ops::Range;
910

10-
use static_assertions::{assert_eq_align, assert_eq_size};
11+
use static_assertions::assert_eq_align;
12+
use static_assertions::assert_eq_size;
1113
use vortex_buffer::ByteBuffer;
12-
use vortex_error::{VortexResult, VortexUnwrap, vortex_ensure, vortex_err};
14+
use vortex_error::VortexResult;
15+
use vortex_error::VortexUnwrap;
16+
use vortex_error::vortex_ensure;
17+
use vortex_error::vortex_err;
1318

1419
/// A view over a variable-length binary value.
1520
///

vortex-vector/src/bool/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ pub use scalar::BoolScalar;
6565

6666
mod iter;
6767

68-
use crate::{Vector, VectorMut};
68+
use crate::Vector;
69+
use crate::VectorMut;
6970

7071
impl From<BoolVector> for Vector {
7172
fn from(v: BoolVector) -> Self {

vortex-vector/src/bool/scalar.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// SPDX-FileCopyrightText: Copyright the Vortex contributors
33

4+
use crate::Scalar;
5+
use crate::ScalarOps;
6+
use crate::VectorMut;
7+
use crate::VectorMutOps;
48
use crate::bool::BoolVectorMut;
5-
use crate::{Scalar, ScalarOps, VectorMut, VectorMutOps};
69

710
/// A scalar value for boolean types.
811
#[derive(Debug)]

vortex-vector/src/bool/vector.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@ use std::fmt::Debug;
77
use std::ops::RangeBounds;
88

99
use vortex_buffer::BitBuffer;
10-
use vortex_error::{VortexExpect, VortexResult, vortex_ensure};
10+
use vortex_error::VortexExpect;
11+
use vortex_error::VortexResult;
12+
use vortex_error::vortex_ensure;
1113
use vortex_mask::Mask;
1214

1315
use crate::VectorOps;
14-
use crate::bool::{BoolScalar, BoolVectorMut};
16+
use crate::bool::BoolScalar;
17+
use crate::bool::BoolVectorMut;
1518

1619
/// An immutable vector of boolean values.
1720
///

vortex-vector/src/bool/vector_mut.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@
44
//! Definition and implementation of [`BoolVectorMut`].
55
66
use vortex_buffer::BitBufferMut;
7-
use vortex_error::{VortexExpect, VortexResult, vortex_ensure};
7+
use vortex_error::VortexExpect;
8+
use vortex_error::VortexResult;
9+
use vortex_error::vortex_ensure;
810
use vortex_mask::MaskMut;
911

10-
use crate::bool::{BoolScalar, BoolVector};
11-
use crate::{VectorMutOps, VectorOps};
12+
use crate::VectorMutOps;
13+
use crate::VectorOps;
14+
use crate::bool::BoolScalar;
15+
use crate::bool::BoolVector;
1216

1317
/// A mutable vector of boolean values.
1418
///

0 commit comments

Comments
 (0)