Skip to content

Commit 825e154

Browse files
committed
Move ArrayVecCopy from root to copy module.
1 parent 398ab39 commit 825e154

File tree

4 files changed

+33
-35
lines changed

4 files changed

+33
-35
lines changed

generate_arrayvec_copy

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ set -o pipefail
1212

1313
sed \
1414
-e "s/\\<ArrayVec\\>/ArrayVecCopy/g" \
15+
-e "s/\\<arrayvec::ArrayVecCopy\\>/arrayvec::copy::ArrayVecCopy/g" \
1516
-e "s/impl<\\('[A-Za-z_]*, \\)\\?T:/impl<\\1T: Copy +/g" \
1617
-e "s/impl<\\('[A-Za-z_]*, \\)\\?T,/impl<\\1T: Copy,/g" \
1718
-e "s/struct \\([A-Za-z_]*\\)<\\('[A-Za-z_]*, \\)\\?T:/struct \\1<\\2T: Copy +/g" \
@@ -21,6 +22,4 @@ sed \
2122
-e "s/const fn/fn/" \
2223
-e "s/\\/\\/ DIRECTIVE ArrayVecCopy \\+//" \
2324
src/arrayvec.rs \
24-
> src/arrayvec_copy_generated.rs
25-
26-
mv -v -f src/arrayvec_copy_generated.rs src/arrayvec_copy.rs
25+
> src/arrayvec_copy.rs

src/arrayvec_copy.rs

+29-29
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
8484
/// The maximum capacity is given by the generic parameter `CAP`.
8585
///
8686
/// ```
87-
/// use arrayvec::ArrayVecCopy;
87+
/// use arrayvec::copy::ArrayVecCopy;
8888
///
8989
/// let mut array = ArrayVecCopy::<_, 16>::new();
9090
/// array.push(1);
@@ -107,7 +107,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
107107
/// The maximum capacity is given by the generic parameter `CAP`.
108108
///
109109
/// ```
110-
/// use arrayvec::ArrayVecCopy;
110+
/// use arrayvec::copy::ArrayVecCopy;
111111
///
112112
/// static ARRAY: ArrayVecCopy<u8, 1024> = ArrayVecCopy::new_const();
113113
/// ```
@@ -119,7 +119,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
119119
/// Return the number of elements in the `ArrayVecCopy`.
120120
///
121121
/// ```
122-
/// use arrayvec::ArrayVecCopy;
122+
/// use arrayvec::copy::ArrayVecCopy;
123123
///
124124
/// let mut array = ArrayVecCopy::from([1, 2, 3]);
125125
/// array.pop();
@@ -131,7 +131,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
131131
/// Returns whether the `ArrayVecCopy` is empty.
132132
///
133133
/// ```
134-
/// use arrayvec::ArrayVecCopy;
134+
/// use arrayvec::copy::ArrayVecCopy;
135135
///
136136
/// let mut array = ArrayVecCopy::from([1]);
137137
/// array.pop();
@@ -143,7 +143,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
143143
/// Return the capacity of the `ArrayVecCopy`.
144144
///
145145
/// ```
146-
/// use arrayvec::ArrayVecCopy;
146+
/// use arrayvec::copy::ArrayVecCopy;
147147
///
148148
/// let array = ArrayVecCopy::from([1, 2, 3]);
149149
/// assert_eq!(array.capacity(), 3);
@@ -154,7 +154,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
154154
/// Return true if the `ArrayVecCopy` is completely filled to its capacity, false otherwise.
155155
///
156156
/// ```
157-
/// use arrayvec::ArrayVecCopy;
157+
/// use arrayvec::copy::ArrayVecCopy;
158158
///
159159
/// let mut array = ArrayVecCopy::<_, 1>::new();
160160
/// assert!(!array.is_full());
@@ -166,7 +166,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
166166
/// Returns the capacity left in the `ArrayVecCopy`.
167167
///
168168
/// ```
169-
/// use arrayvec::ArrayVecCopy;
169+
/// use arrayvec::copy::ArrayVecCopy;
170170
///
171171
/// let mut array = ArrayVecCopy::from([1, 2, 3]);
172172
/// array.pop();
@@ -181,7 +181,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
181181
/// ***Panics*** if the vector is already full.
182182
///
183183
/// ```
184-
/// use arrayvec::ArrayVecCopy;
184+
/// use arrayvec::copy::ArrayVecCopy;
185185
///
186186
/// let mut array = ArrayVecCopy::<_, 2>::new();
187187
///
@@ -201,7 +201,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
201201
/// is already full.
202202
///
203203
/// ```
204-
/// use arrayvec::ArrayVecCopy;
204+
/// use arrayvec::copy::ArrayVecCopy;
205205
///
206206
/// let mut array = ArrayVecCopy::<_, 2>::new();
207207
///
@@ -229,7 +229,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
229229
/// This method uses *debug assertions* to check that the arrayvec is not full.
230230
///
231231
/// ```
232-
/// use arrayvec::ArrayVecCopy;
232+
/// use arrayvec::copy::ArrayVecCopy;
233233
///
234234
/// let mut array = ArrayVecCopy::<_, 2>::new();
235235
///
@@ -253,7 +253,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
253253
/// effect.
254254
///
255255
/// ```
256-
/// use arrayvec::ArrayVecCopy;
256+
/// use arrayvec::copy::ArrayVecCopy;
257257
///
258258
/// let mut array = ArrayVecCopy::from([1, 2, 3, 4, 5]);
259259
/// array.truncate(3);
@@ -287,7 +287,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
287287
/// `try_insert` for fallible version.
288288
///
289289
/// ```
290-
/// use arrayvec::ArrayVecCopy;
290+
/// use arrayvec::copy::ArrayVecCopy;
291291
///
292292
/// let mut array = ArrayVecCopy::<_, 2>::new();
293293
///
@@ -311,7 +311,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
311311
/// ***Panics*** `index` is out of bounds.
312312
///
313313
/// ```
314-
/// use arrayvec::ArrayVecCopy;
314+
/// use arrayvec::copy::ArrayVecCopy;
315315
///
316316
/// let mut array = ArrayVecCopy::<_, 2>::new();
317317
///
@@ -352,7 +352,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
352352
/// Return `Some(` *element* `)` if the vector is non-empty, else `None`.
353353
///
354354
/// ```
355-
/// use arrayvec::ArrayVecCopy;
355+
/// use arrayvec::copy::ArrayVecCopy;
356356
///
357357
/// let mut array = ArrayVecCopy::<_, 2>::new();
358358
///
@@ -374,7 +374,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
374374
/// ***Panics*** if the `index` is out of bounds.
375375
///
376376
/// ```
377-
/// use arrayvec::ArrayVecCopy;
377+
/// use arrayvec::copy::ArrayVecCopy;
378378
///
379379
/// let mut array = ArrayVecCopy::from([1, 2, 3]);
380380
///
@@ -399,7 +399,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
399399
/// Return `Some(` *element* `)` if the index is in bounds, else `None`.
400400
///
401401
/// ```
402-
/// use arrayvec::ArrayVecCopy;
402+
/// use arrayvec::copy::ArrayVecCopy;
403403
///
404404
/// let mut array = ArrayVecCopy::from([1, 2, 3]);
405405
///
@@ -424,7 +424,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
424424
/// ***Panics*** if the `index` is out of bounds.
425425
///
426426
/// ```
427-
/// use arrayvec::ArrayVecCopy;
427+
/// use arrayvec::copy::ArrayVecCopy;
428428
///
429429
/// let mut array = ArrayVecCopy::from([1, 2, 3]);
430430
///
@@ -445,7 +445,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
445445
/// is no element at `index`. Otherwise, return the element inside `Some`.
446446
///
447447
/// ```
448-
/// use arrayvec::ArrayVecCopy;
448+
/// use arrayvec::copy::ArrayVecCopy;
449449
///
450450
/// let mut array = ArrayVecCopy::from([1, 2, 3]);
451451
///
@@ -470,7 +470,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
470470
/// elements.
471471
///
472472
/// ```
473-
/// use arrayvec::ArrayVecCopy;
473+
/// use arrayvec::copy::ArrayVecCopy;
474474
///
475475
/// let mut array = ArrayVecCopy::from([1, 2, 3, 4]);
476476
/// array.retain(|x| *x & 1 != 0 );
@@ -562,7 +562,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
562562
/// # Examples
563563
///
564564
/// ```
565-
/// use arrayvec::ArrayVecCopy;
565+
/// use arrayvec::copy::ArrayVecCopy;
566566
///
567567
/// // Allocate vector big enough for 10 elements.
568568
/// let mut v: ArrayVecCopy<i32, 10> = ArrayVecCopy::new();
@@ -601,7 +601,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
601601
/// Copy all elements from the slice and append to the `ArrayVecCopy`.
602602
///
603603
/// ```
604-
/// use arrayvec::ArrayVecCopy;
604+
/// use arrayvec::copy::ArrayVecCopy;
605605
///
606606
/// let mut vec: ArrayVecCopy<usize, 10> = ArrayVecCopy::new();
607607
/// vec.push(1);
@@ -645,7 +645,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
645645
/// the end point is greater than the length of the vector.
646646
///
647647
/// ```
648-
/// use arrayvec::ArrayVecCopy;
648+
/// use arrayvec::copy::ArrayVecCopy;
649649
///
650650
/// let mut v1 = ArrayVecCopy::from([1, 2, 3]);
651651
/// let v2: ArrayVecCopy<_, 3> = v1.drain(0..2).collect();
@@ -726,7 +726,7 @@ impl<T: Copy, const CAP: usize> ArrayVecCopy<T, CAP> {
726726
/// Returns the ArrayVecCopy, replacing the original with a new empty ArrayVecCopy.
727727
///
728728
/// ```
729-
/// use arrayvec::ArrayVecCopy;
729+
/// use arrayvec::copy::ArrayVecCopy;
730730
///
731731
/// let mut v = ArrayVecCopy::from([0, 1, 2, 3]);
732732
/// assert_eq!([0, 1, 2, 3], v.take().into_inner().unwrap());
@@ -796,7 +796,7 @@ impl<T: Copy, const CAP: usize> DerefMut for ArrayVecCopy<T, CAP> {
796796
/// Create an `ArrayVecCopy` from an array.
797797
///
798798
/// ```
799-
/// use arrayvec::ArrayVecCopy;
799+
/// use arrayvec::copy::ArrayVecCopy;
800800
///
801801
/// let mut array = ArrayVecCopy::from([1, 2, 3]);
802802
/// assert_eq!(array.len(), 3);
@@ -821,7 +821,7 @@ impl<T: Copy, const CAP: usize> From<[T; CAP]> for ArrayVecCopy<T, CAP> {
821821
/// fit.
822822
///
823823
/// ```
824-
/// use arrayvec::ArrayVecCopy;
824+
/// use arrayvec::copy::ArrayVecCopy;
825825
/// use std::convert::TryInto as _;
826826
///
827827
/// let array: ArrayVecCopy<_, 4> = (&[1, 2, 3] as &[_]).try_into().unwrap();
@@ -848,7 +848,7 @@ impl<T: Copy, const CAP: usize> std::convert::TryFrom<&[T]> for ArrayVecCopy<T,
848848
/// Iterate the `ArrayVecCopy` with references to each element.
849849
///
850850
/// ```
851-
/// use arrayvec::ArrayVecCopy;
851+
/// use arrayvec::copy::ArrayVecCopy;
852852
///
853853
/// let array = ArrayVecCopy::from([1, 2, 3]);
854854
///
@@ -865,7 +865,7 @@ impl<'a, T: Copy + 'a, const CAP: usize> IntoIterator for &'a ArrayVecCopy<T, CA
865865
/// Iterate the `ArrayVecCopy` with mutable references to each element.
866866
///
867867
/// ```
868-
/// use arrayvec::ArrayVecCopy;
868+
/// use arrayvec::copy::ArrayVecCopy;
869869
///
870870
/// let mut array = ArrayVecCopy::from([1, 2, 3]);
871871
///
@@ -884,7 +884,7 @@ impl<'a, T: Copy + 'a, const CAP: usize> IntoIterator for &'a mut ArrayVecCopy<T
884884
/// The vector is consumed by this operation.
885885
///
886886
/// ```
887-
/// use arrayvec::ArrayVecCopy;
887+
/// use arrayvec::copy::ArrayVecCopy;
888888
///
889889
/// for elt in ArrayVecCopy::from([1, 2, 3]) {
890890
/// // ...
@@ -906,7 +906,7 @@ impl<T: Copy, const CAP: usize> IntoIterator for ArrayVecCopy<T, CAP> {
906906
/// Cannot ensure that previous moves of the `ArrayVecCopy` did not leave values on the stack.
907907
///
908908
/// ```
909-
/// use arrayvec::ArrayVecCopy;
909+
/// use arrayvec::copy::ArrayVecCopy;
910910
/// use zeroize::Zeroize;
911911
/// let mut array = ArrayVecCopy::from([1, 2, 3]);
912912
/// array.zeroize();

src/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,9 @@ mod errors;
6666
mod utils;
6767

6868
pub mod copy {
69-
pub use crate::arrayvec_copy::{Drain, IntoIter};
69+
pub use crate::arrayvec_copy::{ArrayVecCopy, Drain, IntoIter};
7070
}
7171

72-
pub use crate::arrayvec_copy::ArrayVecCopy;
7372
pub use crate::array_string::ArrayString;
7473
pub use crate::errors::CapacityError;
7574

tests/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extern crate arrayvec;
33

44
use arrayvec::ArrayVec;
55
use arrayvec::ArrayString;
6-
use arrayvec::ArrayVecCopy;
6+
use arrayvec::copy::ArrayVecCopy;
77
use std::mem;
88
use arrayvec::CapacityError;
99

0 commit comments

Comments
 (0)