Skip to content

Commit d619228

Browse files
committed
hybrid-array: remove ByteArray alias
It's longer than `Array<u8, _>` and provides little value other than needless indirection. Closes #987
1 parent 143f342 commit d619228

File tree

3 files changed

+25
-17
lines changed

3 files changed

+25
-17
lines changed

Cargo.lock

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

hybrid-array/src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -514,9 +514,6 @@ fn check_slice_length<T, U: ArraySize>(slice: &[T]) -> Result<(), TryFromSliceEr
514514
Ok(())
515515
}
516516

517-
/// Byte array type.
518-
pub type ByteArray<U> = Array<u8, U>;
519-
520517
/// Array operations which are const generic over a given array size.
521518
pub trait ArrayOps<T, const N: usize>:
522519
AsRef<[T; N]>

hybrid-array/tests/mod.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use hybrid_array::{Array, ByteArray};
1+
use hybrid_array::Array;
22
use typenum::{U0, U2, U3, U4, U6, U7};
33

44
const EXAMPLE_SLICE: &[u8] = &[1, 2, 3, 4, 5, 6];
@@ -11,38 +11,38 @@ fn clone_from_slice() {
1111

1212
#[test]
1313
fn tryfrom_slice_for_array() {
14-
assert!(ByteArray::<U0>::try_from(EXAMPLE_SLICE).is_err());
15-
assert!(ByteArray::<U3>::try_from(EXAMPLE_SLICE).is_err());
14+
assert!(Array::<u8, U0>::try_from(EXAMPLE_SLICE).is_err());
15+
assert!(Array::<u8, U3>::try_from(EXAMPLE_SLICE).is_err());
1616

17-
let array_ref = ByteArray::<U6>::try_from(EXAMPLE_SLICE).expect("slice contains 6 bytes");
17+
let array_ref = Array::<u8, U6>::try_from(EXAMPLE_SLICE).expect("slice contains 6 bytes");
1818
assert_eq!(&*array_ref, EXAMPLE_SLICE);
1919

20-
assert!(ByteArray::<U7>::try_from(EXAMPLE_SLICE).is_err());
20+
assert!(Array::<u8, U7>::try_from(EXAMPLE_SLICE).is_err());
2121
}
2222

2323
#[test]
2424
fn tryfrom_slice_for_array_ref() {
25-
assert!(<&ByteArray<U0>>::try_from(EXAMPLE_SLICE).is_err());
26-
assert!(<&ByteArray::<U3>>::try_from(EXAMPLE_SLICE).is_err());
25+
assert!(<&Array<u8, U0>>::try_from(EXAMPLE_SLICE).is_err());
26+
assert!(<&Array::<u8, U3>>::try_from(EXAMPLE_SLICE).is_err());
2727

28-
let array_ref = <&ByteArray<U6>>::try_from(EXAMPLE_SLICE).expect("slice contains 6 bytes");
28+
let array_ref = <&Array<u8, U6>>::try_from(EXAMPLE_SLICE).expect("slice contains 6 bytes");
2929
assert_eq!(array_ref.as_slice(), EXAMPLE_SLICE);
3030

31-
assert!(<&ByteArray::<U7>>::try_from(EXAMPLE_SLICE).is_err());
31+
assert!(<&Array::<u8, U7>>::try_from(EXAMPLE_SLICE).is_err());
3232
}
3333

3434
#[test]
3535
fn concat() {
36-
let prefix = ByteArray::<U2>::clone_from_slice(&EXAMPLE_SLICE[..2]);
37-
let suffix = ByteArray::<U4>::clone_from_slice(&EXAMPLE_SLICE[2..]);
36+
let prefix = Array::<u8, U2>::clone_from_slice(&EXAMPLE_SLICE[..2]);
37+
let suffix = Array::<u8, U4>::clone_from_slice(&EXAMPLE_SLICE[2..]);
3838

3939
let array = prefix.concat(suffix);
4040
assert_eq!(array.as_slice(), EXAMPLE_SLICE);
4141
}
4242

4343
#[test]
4444
fn split() {
45-
let array = ByteArray::<U6>::clone_from_slice(EXAMPLE_SLICE);
45+
let array = Array::<u8, U6>::clone_from_slice(EXAMPLE_SLICE);
4646

4747
let (prefix, suffix) = array.split::<U2>();
4848

@@ -52,7 +52,7 @@ fn split() {
5252

5353
#[test]
5454
fn split_ref() {
55-
let array = ByteArray::<U6>::clone_from_slice(EXAMPLE_SLICE);
55+
let array = Array::<u8, U6>::clone_from_slice(EXAMPLE_SLICE);
5656

5757
let (prefix, suffix) = array.split_ref::<U3>();
5858

@@ -62,7 +62,7 @@ fn split_ref() {
6262

6363
#[test]
6464
fn split_ref_mut() {
65-
let array = &mut ByteArray::<U6>::clone_from_slice(EXAMPLE_SLICE);
65+
let array = &mut Array::<u8, U6>::clone_from_slice(EXAMPLE_SLICE);
6666

6767
let (prefix, suffix) = array.split_ref_mut::<U4>();
6868

0 commit comments

Comments
 (0)