Skip to content

Commit d93f0e6

Browse files
authored
Merge pull request #807 from epage/clippy
style: Make clippy happy
2 parents 17b0c36 + 36fb1ef commit d93f0e6

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

crates/toml/src/map.rs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,14 @@ impl Map<String, Value> {
135135
String: Borrow<Q>,
136136
Q: Ord + Eq + Hash + ?Sized,
137137
{
138-
self.map.remove(key)
138+
#[cfg(not(feature = "preserve_order"))]
139+
{
140+
self.map.remove(key)
141+
}
142+
#[cfg(feature = "preserve_order")]
143+
{
144+
self.map.shift_remove(key)
145+
}
139146
}
140147

141148
/// Retains only the elements specified by the `keep` predicate.
@@ -501,7 +508,14 @@ impl<'a> OccupiedEntry<'a> {
501508
/// Takes the value of the entry out of the map, and returns it.
502509
#[inline]
503510
pub fn remove(self) -> Value {
504-
self.occupied.remove()
511+
#[cfg(not(feature = "preserve_order"))]
512+
{
513+
self.occupied.remove()
514+
}
515+
#[cfg(feature = "preserve_order")]
516+
{
517+
self.occupied.shift_remove()
518+
}
505519
}
506520
}
507521

crates/toml_edit/src/ser/map.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use super::{Error, KeySerializer, SerializeValueArray, ValueSerializer};
22

33
#[doc(hidden)]
4+
#[allow(clippy::large_enum_variant)]
45
pub enum SerializeMap {
56
Datetime(SerializeDatetime),
67
Table(SerializeInlineTable),

0 commit comments

Comments
 (0)