Skip to content

Commit 493768f

Browse files
authored
Merge branch 'main' into cstring
2 parents fe2921b + a326f11 commit 493768f

File tree

11 files changed

+292
-262
lines changed

11 files changed

+292
-262
lines changed

CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
5050
- Added `String::uDisplay`.
5151
- Added `CString`.
5252
- Added `LenT` generic to `Vec<T, N>` and `VecView<T>` to save memory when using a sane capacity value.
53+
- Added the `index_set` module.
54+
- Added the `index_map` module.
5355

5456
### Changed
5557

@@ -61,13 +63,36 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
6163
- `Vec::extend_from_slice`
6264
- `Vec::from_slice`
6365
- `Vec::resize_default`
66+
> * [ ] Remove `Q*` type aliases for `MpMcQueue`, and rename it to just `Queue`
6467
- `Vec::resize`
6568
- Renamed `FromUtf16Error::DecodeUtf16Error` to `FromUtf16Error::DecodeUtf16`.
6669
- Changed `stable_deref_trait` to a platform-dependent dependency.
6770
- Changed `SortedLinkedList::pop` return type from `Result<T, ()>` to `Option<T>` to match `std::vec::pop`.
6871
- `Vec::capacity` is no longer a `const` function.
6972
- Relaxed bounds on `PartialEq` for `IndexMap` from `V: Eq` to `V1: PartialEq<V2>`.
7073
- Relaxed bounds on `PartialEq` for `LinearMap` from `V: PartialEq` to `V1: PartialEq<V2>`.
74+
- The `FnvIndexSet` type is now inside the `index_set` module.
75+
- The `IndexSetIter` type is now inside the `index_set` module and has been renamed to `Iter`.
76+
- The `Bucket` type is now inside the `index_map` module.
77+
- The `Entry` type is now inside the `index_map` module.
78+
- The `FnvIndexMap` type is now inside the `index_map` module.
79+
- The `IndexMapIter` type is now inside the `index_map` module and has been renamed to `Iter`.
80+
- The `IndexMapIterMut` type is now inside the `index_map` module and has been renamed to `IterMut`.
81+
- The `IndexMapKeys` type is now inside the `index_map` module and has been renamed to `Keys`.
82+
- The `OccupiedEntry` type is now inside the `index_map` module.
83+
- The `Pos` type is now inside the `index_map` module.
84+
- The `VacantEntry` type is now inside the `index_map` module.
85+
- The `VacantEntry` type is now inside the `index_map` module.
86+
- The `IndexMapValues` type is now inside the `index_map` module and has been renamed to `Values`.
87+
- The `IndexMapValuesMut` type is now inside the `index_map` module and has been renamed to `ValuesMut`.
88+
- The `histbuf` module has been renamed to `history_buf`.
89+
- The `HistoryBuffer` type has been renamed to `HistoryBuf`.
90+
- The `HistoryBufferView` type has been renamed to `HistoryBufView`.
91+
- The `OwnedHistBufStorage` type has been renamed to `OwnedHistoryBufStorage`.
92+
- The `ViewHistBufStorage` type has been renamed to `ViewHistoryBufStorage`.
93+
- The `MpMcQueue` type has been renamed to `Queue`.
94+
- The `MpMcQueueView` type has been renamed to `QueueView`.
95+
- The `MpMcQueueInner` type has been renamed to `QueueInner`.
7196

7297
### Fixed
7398

@@ -83,6 +108,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
83108
- `Vec::storage_capacity` has been removed and `Vec::capacity` must be used instead.
84109
- Removed `sorted_linked_list::Iter` and `sorted_linked_list::IterInner`.
85110
- Removed `sorted_linked_list::FindMut` and `sorted_linked_list::FindMutInner`.
111+
- The `Q2`, `Q4`, `Q8`, `Q16`, `Q32` and `Q64` aliases for `MpMcQueue` have been removed.
86112

87113
## [v0.8.0] - 2023-11-07
88114

src/de.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::{
2-
binary_heap::Kind as BinaryHeapKind, len_type::LenType, BinaryHeap, Deque, HistoryBuffer,
2+
binary_heap::Kind as BinaryHeapKind, len_type::LenType, BinaryHeap, Deque, HistoryBuf,
33
IndexMap, IndexSet, LinearMap, String, Vec,
44
};
55
use core::{
@@ -174,7 +174,7 @@ where
174174
}
175175
}
176176

177-
impl<'de, T, const N: usize> Deserialize<'de> for HistoryBuffer<T, N>
177+
impl<'de, T, const N: usize> Deserialize<'de> for HistoryBuf<T, N>
178178
where
179179
T: Deserialize<'de>,
180180
{
@@ -188,7 +188,7 @@ where
188188
where
189189
T: Deserialize<'de>,
190190
{
191-
type Value = HistoryBuffer<T, N>;
191+
type Value = HistoryBuf<T, N>;
192192

193193
fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
194194
formatter.write_str("a sequence")
@@ -198,7 +198,7 @@ where
198198
where
199199
A: SeqAccess<'de>,
200200
{
201-
let mut values = HistoryBuffer::new();
201+
let mut values = HistoryBuf::new();
202202

203203
while let Some(value) = seq.next_element()? {
204204
values.write(value);

0 commit comments

Comments
 (0)