Skip to content

Commit f9342b4

Browse files
author
Gianmarco Garrisi
committed
Revert "Update Edition"
This reverts commit 6422a96.
1 parent 5b5987b commit f9342b4

7 files changed

Lines changed: 13 additions & 16 deletions

File tree

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ readme = "README.md"
99
keywords = ["priority", "queue", "heap"]
1010
categories = ["data-structures", "algorithms"]
1111
license = "LGPL-3.0-or-later OR MPL-2.0"
12-
edition = "2024"
13-
rust-version = "1.85"
12+
edition = "2021"
1413

1514
[build-dependencies]
1615
autocfg = "1"

benches/priority_queue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ mod benchmarks {
3333
extern crate test;
3434
use hashbrown::hash_map::DefaultHashBuilder;
3535
use priority_queue::{DoublePriorityQueue, PriorityQueue};
36-
use test::{Bencher, black_box};
36+
use test::{black_box, Bencher};
3737

3838
#[bench]
3939
fn push_and_pop(b: &mut Bencher) {

src/double_priority_queue/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ pub mod iterators;
3434
#[cfg(not(feature = "std"))]
3535
use std::vec::Vec;
3636

37-
use crate::TryReserveError;
3837
use crate::core_iterators::*;
3938
use crate::store::{Index, Position, Store};
39+
use crate::TryReserveError;
4040
use iterators::*;
4141

4242
use std::borrow::Borrow;

src/priority_queue/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ pub mod iterators;
3535
#[cfg(not(feature = "std"))]
3636
use std::vec::Vec;
3737

38-
use crate::TryReserveError;
3938
use crate::core_iterators::*;
4039
use crate::store::{Index, Position, Store};
40+
use crate::TryReserveError;
4141
use iterators::*;
4242

4343
use std::borrow::Borrow;

src/store.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ use std::vec::Vec;
3030

3131
// an improvement in terms of complexity would be to use a bare HashMap
3232
// as vec instead of the IndexMap
33-
use crate::TryReserveError;
3433
use crate::core_iterators::*;
34+
use crate::TryReserveError;
3535

3636
use std::borrow::Borrow;
3737
use std::cmp::{Eq, Ord};
@@ -302,14 +302,12 @@ impl<I, P, H> Store<I, P, H> {
302302
}
303303

304304
#[inline(always)]
305-
pub unsafe fn get_priority_from_position(&self, position: Position) -> &P {
306-
unsafe {
307-
self.map
308-
.get_index(self.heap.get_unchecked(position.0).0)
309-
.unwrap()
310-
.1
311-
}
312-
}
305+
pub unsafe fn get_priority_from_position(&self, position: Position) -> &P { unsafe {
306+
self.map
307+
.get_index(self.heap.get_unchecked(position.0).0)
308+
.unwrap()
309+
.1
310+
}}
313311
}
314312

315313
impl<I, P, H> Store<I, P, H>

tests/double_priority_queue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,7 @@ mod doublepq_tests {
10401040
#[cfg(all(feature = "serde", test))]
10411041
mod serde_tests_basics {
10421042
use priority_queue::DoublePriorityQueue;
1043-
use serde_test::{Token, assert_tokens};
1043+
use serde_test::{assert_tokens, Token};
10441044
#[test]
10451045
fn serde_empty() {
10461046
let pq: DoublePriorityQueue<String, i32> = DoublePriorityQueue::new();

tests/priority_queue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ mod pqueue_tests {
854854
#[cfg(all(feature = "serde", test))]
855855
mod serde_tests_basics {
856856
use priority_queue::PriorityQueue;
857-
use serde_test::{Token, assert_tokens};
857+
use serde_test::{assert_tokens, Token};
858858
#[test]
859859
fn serde_empty() {
860860
let pq: PriorityQueue<String, i32> = PriorityQueue::new();

0 commit comments

Comments
 (0)