Commit 5e8bf486 authored by Jim Newsome's avatar Jim Newsome
Browse files

cargo fmt

parent 3615e026

crates/tor-netdir/src/lib.rs

+21 −5
Original line number Diff line number Diff line
@@ -1711,10 +1711,23 @@ impl NetDir { 
        R: rand::Rng,

        P: FnMut(&Relay<'a>) -> bool,

    {

        let filtered_weighted_relays: Vec<_> = self.relays().filter_map(|r| if usable(&r) { Some((r.clone(), self.weights.weight_rs_for_role(r.rs, role))) } else { None }).collect();

        let filtered_weighted_relays: Vec<_> = self

            .relays()

            .filter_map(|r| {

                if usable(&r) {

                    Some((r.clone(), self.weights.weight_rs_for_role(r.rs, role)))

                } else {

                    None

                }

            })

            .collect();



        // NOTE: See discussion in pick_relay().

        let mut sampled_relays = match filtered_weighted_relays[..].sample_weighted(rng, n, |(_r, w)| *w as f64) {

        let mut sampled_relays = match filtered_weighted_relays[..].sample_weighted(

            rng,

            n,

            |(_r, w)| *w as f64,

        ) {

            Err(WeightError::InsufficientNonZero) => {

                // Too few relays had nonzero weights: return all of those that are okay.

                // (This is behavior used to come up with rand 0.9; it no longer does.
@@ -1728,7 +1741,10 @@ impl NetDir { 
                    warn!(?self.weights, ?role,

                          "After filtering, all {} relays had zero weight! Picking some at random. See bug #1907.",

                          filtered_weighted_relays.len());

                    let filtered_relays: Vec<_> = filtered_weighted_relays.iter().map(|(r, _w)| r.clone()).collect();

                    let filtered_relays: Vec<_> = filtered_weighted_relays

                        .iter()

                        .map(|(r, _w)| r.clone())

                        .collect();

                    if filtered_relays.len() >= n {

                        filtered_relays.sample(rng, n).cloned().collect()

                    } else {