From 606ec5b90bd9ef95f79c26241e102a9714a0969c Mon Sep 17 00:00:00 2001
From: Julien Rabier <taziden@flexiden.org>
Date: Wed, 29 Jul 2020 12:00:50 +0200
Subject: [PATCH] simplify and improve readability

---
 src/main.rs | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 77fd1f4..d3b292f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,6 @@
 use chrono::Local;
 use mpd::{Client, Query, Song};
 use rand::prelude::*;
-use rand::seq::SliceRandom;
 use std::{thread, time};
 
 fn main() {
@@ -64,16 +63,10 @@ fn add_track() {
 fn get_random_track() -> Song {
     let mut c = Client::default();
 
-    const CHARSET: &[u8] = b"abcdefghijklmnopqrstuvwxyz";
-    const CHARS_LEN: usize = 2;
+    let alphavec: Vec<char> = "abcdefghijklmnopqrstuvwxyz".chars().collect();
     let mut rng = rand::thread_rng();
 
-    let chars: String = (0..CHARS_LEN)
-        .map(|_| {
-            let idx = rng.gen_range(0, CHARSET.len());
-            CHARSET[idx] as char
-        })
-        .collect();
+    let chars: String = alphavec.choose_multiple(&mut rng, 2).cloned().collect();
 
     let mut query = Query::new();
     let query = query.and(mpd::Term::Any, chars);