Switch webgraph to 2024 edition

webgraph/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "webgraph"
 version = "0.4.0"
-edition = "2021"
+edition = "2024"
 description = "A Rust port of the WebGraph framework (http://webgraph.di.unimi.it/)."
 repository = "https://github.com/vigna/webgraph-rs/"
 license = "Apache-2.0 OR LGPL-2.1-or-later"

webgraph/examples/bench_sort_pairs.rs

@@ -11,11 +11,11 @@ use anyhow::Result;
 use clap::Parser;
 use dsi_bitstream::traits::BitRead;
 use dsi_bitstream::traits::BitWrite;
-use dsi_bitstream::traits::{Endianness, BE};
+use dsi_bitstream::traits::{BE, Endianness};
 use dsi_progress_logger::prelude::{ProgressLog, ProgressLogger};
-use rand::rngs::SmallRng;
 use rand::RngCore;
 use rand::SeedableRng;
+use rand::rngs::SmallRng;
 use tempfile::Builder;
 use webgraph::prelude::*;
 use webgraph::utils::gaps::GapsCodec;

webgraph/examples/bench_swh_labels.rs

@@ -10,7 +10,7 @@ use bitstream::Supply;
 use clap::Parser;
 use dsi_bitstream::codes::GammaRead;
 use dsi_bitstream::impls::{BufBitReader, MemWordReader};
-use dsi_bitstream::traits::{BitRead, BitSeek, Endianness, BE};
+use dsi_bitstream::traits::{BE, BitRead, BitSeek, Endianness};
 use dsi_progress_logger::prelude::*;
 use epserde::deser::{Deserialize, Flags};
 use lender::*;

webgraph/src/graphs/arc_list_graph.rs

@@ -5,7 +5,7 @@
  */
 
 use crate::{labels::Left, traits::*};
-use anyhow::{ensure, Result};
+use anyhow::{Result, ensure};
 use lender::*;
 
 /// An adapter exhibiting a list of labeled arcs sorted by source as a [labeled
@@ -108,7 +108,10 @@ impl<L: Clone + 'static, I: Iterator<Item = ((usize, usize), L)>> Iter<L, I> {
     pub fn try_new_from(num_nodes: usize, iter: I, from: usize) -> Result<Self> {
         let mut iter = iter.peekable();
         if let Some(((first_src, _), _)) = iter.peek() {
-            ensure!(*first_src >= from, "Tried to create arc_list_graph::Iter starting from {from} using an iterator starting from {first_src}");
+            ensure!(
+                *first_src >= from,
+                "Tried to create arc_list_graph::Iter starting from {from} using an iterator starting from {first_src}"
+            );
         }
         Ok(Iter {
             num_nodes: num_nodes + from,
@@ -222,7 +225,7 @@ impl<L, I: IntoIterator<Item = ((usize, usize), L)>> Iterator for Succ<'_, L, I>
     type Item = (usize, L);
     fn next(&mut self) -> Option<Self::Item> {
         // If the next pair is not there, or it has a different source, we are done
-        if self.node_iter.iter.peek()?.0 .0 >= self.node_iter.next_node {
+        if self.node_iter.iter.peek()?.0.0 >= self.node_iter.next_node {
             return None;
         }
         // get the next labeled pair

webgraph/src/graphs/bvgraph/codecs/dec_const.rs

@@ -8,8 +8,8 @@
 use std::marker::PhantomData;
 
 use super::super::*;
-use anyhow::bail;
 use anyhow::Result;
+use anyhow::bail;
 use dsi_bitstream::dispatch::code_consts;
 use dsi_bitstream::dispatch::factory::CodesReaderFactoryHelper;
 use dsi_bitstream::prelude::*;
@@ -38,14 +38,14 @@ pub struct ConstCodesDecoder<
 }
 
 impl<
-        E: Endianness,
-        CR: CodesRead<E> + BitSeek,
-        const OUTDEGREES: usize,
-        const REFERENCES: usize,
-        const BLOCKS: usize,
-        const INTERVALS: usize,
-        const RESIDUALS: usize,
-    > BitSeek for ConstCodesDecoder<E, CR, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
+    E: Endianness,
+    CR: CodesRead<E> + BitSeek,
+    const OUTDEGREES: usize,
+    const REFERENCES: usize,
+    const BLOCKS: usize,
+    const INTERVALS: usize,
+    const RESIDUALS: usize,
+> BitSeek for ConstCodesDecoder<E, CR, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
 {
     type Error = <CR as BitSeek>::Error;
 
@@ -59,14 +59,14 @@ impl<
 }
 
 impl<
-        E: Endianness,
-        CR: CodesRead<E>,
-        const OUTDEGREES: usize,
-        const REFERENCES: usize,
-        const BLOCKS: usize,
-        const INTERVALS: usize,
-        const RESIDUALS: usize,
-    > ConstCodesDecoder<E, CR, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
+    E: Endianness,
+    CR: CodesRead<E>,
+    const OUTDEGREES: usize,
+    const REFERENCES: usize,
+    const BLOCKS: usize,
+    const INTERVALS: usize,
+    const RESIDUALS: usize,
+> ConstCodesDecoder<E, CR, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
 {
     /// Creates a new [`ConstCodesEncoder`] from a [`CodesRead`] implementation.
     /// and a [`CompFlags`] struct
@@ -96,14 +96,14 @@ impl<
 }
 
 impl<
-        E: Endianness,
-        CR: CodesRead<E>,
-        const OUTDEGREES: usize,
-        const REFERENCES: usize,
-        const BLOCKS: usize,
-        const INTERVALS: usize,
-        const RESIDUALS: usize,
-    > Decode for ConstCodesDecoder<E, CR, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
+    E: Endianness,
+    CR: CodesRead<E>,
+    const OUTDEGREES: usize,
+    const REFERENCES: usize,
+    const BLOCKS: usize,
+    const INTERVALS: usize,
+    const RESIDUALS: usize,
+> Decode for ConstCodesDecoder<E, CR, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
 {
     #[inline(always)]
     fn read_outdegree(&mut self) -> u64 {
@@ -167,15 +167,15 @@ pub struct ConstCodesDecoderFactory<
 }
 
 impl<
-        E: Endianness,
-        F: CodesReaderFactoryHelper<E>,
-        OFF: Offsets,
-        const OUTDEGREES: usize,
-        const REFERENCES: usize,
-        const BLOCKS: usize,
-        const INTERVALS: usize,
-        const RESIDUALS: usize,
-    > ConstCodesDecoderFactory<E, F, OFF, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
+    E: Endianness,
+    F: CodesReaderFactoryHelper<E>,
+    OFF: Offsets,
+    const OUTDEGREES: usize,
+    const REFERENCES: usize,
+    const BLOCKS: usize,
+    const INTERVALS: usize,
+    const RESIDUALS: usize,
+> ConstCodesDecoderFactory<E, F, OFF, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
 {
     /// Remaps the offsets in a slice of `usize`.
     ///
@@ -210,15 +210,15 @@ impl<
 }
 
 impl<
-        E: Endianness,
-        F: CodesReaderFactoryHelper<E>,
-        OFF: Offsets,
-        const OUTDEGREES: usize,
-        const REFERENCES: usize,
-        const BLOCKS: usize,
-        const INTERVALS: usize,
-        const RESIDUALS: usize,
-    > ConstCodesDecoderFactory<E, F, OFF, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
+    E: Endianness,
+    F: CodesReaderFactoryHelper<E>,
+    OFF: Offsets,
+    const OUTDEGREES: usize,
+    const REFERENCES: usize,
+    const BLOCKS: usize,
+    const INTERVALS: usize,
+    const RESIDUALS: usize,
+> ConstCodesDecoderFactory<E, F, OFF, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
 {
     /// Creates a new builder from the given data and compression flags.
     pub fn new(factory: F, offsets: MemCase<OFF>, comp_flags: CompFlags) -> anyhow::Result<Self> {
@@ -246,15 +246,15 @@ impl<
 }
 
 impl<
-        E: Endianness,
-        F: CodesReaderFactoryHelper<E>,
-        OFF: Offsets,
-        const OUTDEGREES: usize,
-        const REFERENCES: usize,
-        const BLOCKS: usize,
-        const INTERVALS: usize,
-        const RESIDUALS: usize,
-    > RandomAccessDecoderFactory
+    E: Endianness,
+    F: CodesReaderFactoryHelper<E>,
+    OFF: Offsets,
+    const OUTDEGREES: usize,
+    const REFERENCES: usize,
+    const BLOCKS: usize,
+    const INTERVALS: usize,
+    const RESIDUALS: usize,
+> RandomAccessDecoderFactory
     for ConstCodesDecoderFactory<E, F, OFF, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
 where
     for<'a> <F as CodesReaderFactory<E>>::CodesReader<'a>: BitSeek,
@@ -276,15 +276,15 @@ where
 }
 
 impl<
-        E: Endianness,
-        F: CodesReaderFactoryHelper<E>,
-        OFF: Offsets,
-        const OUTDEGREES: usize,
-        const REFERENCES: usize,
-        const BLOCKS: usize,
-        const INTERVALS: usize,
-        const RESIDUALS: usize,
-    > SequentialDecoderFactory
+    E: Endianness,
+    F: CodesReaderFactoryHelper<E>,
+    OFF: Offsets,
+    const OUTDEGREES: usize,
+    const REFERENCES: usize,
+    const BLOCKS: usize,
+    const INTERVALS: usize,
+    const RESIDUALS: usize,
+> SequentialDecoderFactory
     for ConstCodesDecoderFactory<E, F, OFF, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
 {
     type Decoder<'a>

webgraph/src/graphs/bvgraph/codecs/dec_dyn.rs

@@ -9,8 +9,8 @@
 use std::marker::PhantomData;
 
 use super::super::*;
-use dsi_bitstream::dispatch::factory::CodesReaderFactoryHelper;
 use dsi_bitstream::dispatch::CodesReaderFactory;
+use dsi_bitstream::dispatch::factory::CodesReaderFactoryHelper;
 use dsi_bitstream::prelude::*;
 
 use epserde::deser::{MemCase, Owned};

webgraph/src/graphs/bvgraph/codecs/enc_const.rs

@@ -28,14 +28,14 @@ pub struct ConstCodesEncoder<
 }
 
 impl<
-        E: Endianness,
-        CW: CodesWrite<E> + BitSeek,
-        const OUTDEGREES: usize,
-        const REFERENCES: usize,
-        const BLOCKS: usize,
-        const INTERVALS: usize,
-        const RESIDUALS: usize,
-    > BitSeek for ConstCodesEncoder<E, CW, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
+    E: Endianness,
+    CW: CodesWrite<E> + BitSeek,
+    const OUTDEGREES: usize,
+    const REFERENCES: usize,
+    const BLOCKS: usize,
+    const INTERVALS: usize,
+    const RESIDUALS: usize,
+> BitSeek for ConstCodesEncoder<E, CW, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
 {
     type Error = <CW as BitSeek>::Error;
 
@@ -49,14 +49,14 @@ impl<
 }
 
 impl<
-        E: Endianness,
-        CW: CodesWrite<E>,
-        const OUTDEGREES: usize,
-        const REFERENCES: usize,
-        const BLOCKS: usize,
-        const INTERVALS: usize,
-        const RESIDUALS: usize,
-    > ConstCodesEncoder<E, CW, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
+    E: Endianness,
+    CW: CodesWrite<E>,
+    const OUTDEGREES: usize,
+    const REFERENCES: usize,
+    const BLOCKS: usize,
+    const INTERVALS: usize,
+    const RESIDUALS: usize,
+> ConstCodesEncoder<E, CW, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
 {
     /// Creates a new [`ConstCodesEncoder`] with the given [`CodesWrite`] implementation.
     pub fn new(code_writer: CW) -> Self {
@@ -68,14 +68,14 @@ impl<
 }
 
 impl<
-        E: Endianness,
-        CW: CodesWrite<E>,
-        const OUTDEGREES: usize,
-        const REFERENCES: usize,
-        const BLOCKS: usize,
-        const INTERVALS: usize,
-        const RESIDUALS: usize,
-    > Encode for ConstCodesEncoder<E, CW, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
+    E: Endianness,
+    CW: CodesWrite<E>,
+    const OUTDEGREES: usize,
+    const REFERENCES: usize,
+    const BLOCKS: usize,
+    const INTERVALS: usize,
+    const RESIDUALS: usize,
+> Encode for ConstCodesEncoder<E, CW, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
 {
     type Error = <CW as BitWrite<E>>::Error;
 
@@ -136,14 +136,14 @@ impl<
 }
 
 impl<
-        E: Endianness,
-        CW: CodesWrite<E>,
-        const OUTDEGREES: usize,
-        const REFERENCES: usize,
-        const BLOCKS: usize,
-        const INTERVALS: usize,
-        const RESIDUALS: usize,
-    > EncodeAndEstimate
+    E: Endianness,
+    CW: CodesWrite<E>,
+    const OUTDEGREES: usize,
+    const REFERENCES: usize,
+    const BLOCKS: usize,
+    const INTERVALS: usize,
+    const RESIDUALS: usize,
+> EncodeAndEstimate
     for ConstCodesEncoder<E, CW, OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
 {
     type Estimator<'a>
@@ -166,25 +166,25 @@ pub struct ConstCodesEstimator<
 >;
 
 impl<
-        const OUTDEGREES: usize,
-        const REFERENCES: usize,
-        const BLOCKS: usize,
-        const INTERVALS: usize,
-        const RESIDUALS: usize,
-    > ConstCodesEstimator<OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
+    const OUTDEGREES: usize,
+    const REFERENCES: usize,
+    const BLOCKS: usize,
+    const INTERVALS: usize,
+    const RESIDUALS: usize,
+> ConstCodesEstimator<OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
 {
     pub fn new() -> Self {
         Self
     }
 }
 
 impl<
-        const OUTDEGREES: usize,
-        const REFERENCES: usize,
-        const BLOCKS: usize,
-        const INTERVALS: usize,
-        const RESIDUALS: usize,
-    > Encode for ConstCodesEstimator<OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
+    const OUTDEGREES: usize,
+    const REFERENCES: usize,
+    const BLOCKS: usize,
+    const INTERVALS: usize,
+    const RESIDUALS: usize,
+> Encode for ConstCodesEstimator<OUTDEGREES, REFERENCES, BLOCKS, INTERVALS, RESIDUALS>
 {
     type Error = Infallible;
 

webgraph/src/graphs/bvgraph/codecs/factories.rs

@@ -27,7 +27,7 @@ use crate::{
     prelude::{FileBufReader, MemBufReader},
     utils::MmapHelper,
 };
-use anyhow::{ensure, Context};
+use anyhow::{Context, ensure};
 use bitflags::bitflags;
 use common_traits::UnsignedInt;
 use dsi_bitstream::{

webgraph/src/graphs/bvgraph/comp/flags.rs

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
  */
 
-use anyhow::{bail, ensure, Result};
+use anyhow::{Result, bail, ensure};
 use dsi_bitstream::dispatch::Codes;
 use dsi_bitstream::traits::{BigEndian, Endianness, LittleEndian};
 use std::collections::HashMap;