Remove global variables from top-crates

Author: shepmaster

top-crates/Cargo.lock

@@ -7,7 +7,6 @@ edition = "2018"
 [dependencies]
 cargo = "0.54.0"
 itertools = "0.10.0"
-lazy_static = "1.0.0"
 reqwest = { version = "0.11.0", features = ["blocking"] }
 serde = "1.0.1"
 serde_derive = "1.0.1"

top-crates/Cargo.toml

@@ -13,11 +13,9 @@ use cargo::{
     util::Config,
 };
 use itertools::Itertools;
-use lazy_static::lazy_static;
 use serde::{Deserialize, Serialize};
 use std::{
     collections::{BTreeMap, BTreeSet, HashSet},
-    fs::File,
     io::Read,
 };
 
@@ -52,12 +50,12 @@ pub struct CrateInformation {
 }
 
 /// Hand-curated changes to the crate list
-#[derive(Debug, Deserialize)]
-struct Modifications {
+#[derive(Debug, Default, Deserialize)]
+pub struct Modifications {
     #[serde(default)]
-    exclusions: Vec<String>,
+    pub exclusions: Vec<String>,
     #[serde(default)]
-    additions: BTreeSet<String>,
+    pub additions: BTreeSet<String>,
 }
 
 #[derive(Debug, Serialize, Clone)]
@@ -90,19 +88,6 @@ impl Modifications {
     }
 }
 
-lazy_static! {
-    static ref MODIFICATIONS: Modifications = {
-        let mut f = File::open("crate-modifications.toml")
-            .expect("unable to open crate modifications file");
-
-        let mut d = Vec::new();
-        f.read_to_end(&mut d)
-            .expect("unable to read crate modifications file");
-
-        toml::from_slice(&d).expect("unable to parse crate modifications file")
-    };
-}
-
 fn simple_get(url: &str) -> reqwest::Result<reqwest::blocking::Response> {
     reqwest::blocking::ClientBuilder::new()
         .user_agent("Rust Playground - Top Crates Utility")
@@ -148,9 +133,9 @@ impl TopCrates {
     }
 
     /// Add crates that have been hand-picked
-    fn add_curated_crates(&mut self) {
+    fn add_curated_crates(&mut self, modifications: &Modifications) {
         self.crates.extend({
-            MODIFICATIONS
+            modifications
                 .additions
                 .iter()
                 .cloned()
@@ -234,7 +219,7 @@ fn playground_metadata_features(pkg: &Package) -> Option<(Vec<String>, bool)> {
     }
 }
 
-pub fn generate_info() -> (BTreeMap<String, DependencySpec>, Vec<CrateInformation>) {
+pub fn generate_info(modifications: &Modifications) -> (BTreeMap<String, DependencySpec>, Vec<CrateInformation>) {
     // Setup to interact with cargo.
     let config = Config::default().expect("Unable to create default Cargo config");
     let _lock = config.acquire_package_cache_lock();
@@ -244,13 +229,13 @@ pub fn generate_info() -> (BTreeMap<String, DependencySpec>, Vec<CrateInformatio
 
     let mut top = TopCrates::download();
     top.add_rust_cookbook_crates();
-    top.add_curated_crates();
+    top.add_curated_crates(modifications);
 
     // Find the newest (non-prerelease, non-yanked) versions of all
     // the interesting crates.
     let mut summaries = Vec::new();
     for Crate { name } in &top.crates {
-        if MODIFICATIONS.excluded(name) {
+        if modifications.excluded(name) {
             continue;
         }
 
@@ -326,7 +311,7 @@ pub fn generate_info() -> (BTreeMap<String, DependencySpec>, Vec<CrateInformatio
     let package_ids: Vec<_> = resolve
         .iter()
         .filter(|pkg| valid_for_our_platform.contains(pkg))
-        .filter(|pkg| !MODIFICATIONS.excluded(pkg.name().as_str()))
+        .filter(|pkg| !modifications.excluded(pkg.name().as_str()))
         .collect();
 
     let mut sources = SourceMap::new();

top-crates/src/lib.rs

@@ -5,7 +5,7 @@ use serde::Serialize;
 use std::{
     collections::BTreeMap,
     fs::File,
-    io::Write,
+    io::{Read, Write},
     path::{Path, PathBuf},
 };
 
@@ -43,7 +43,16 @@ struct Profiles {
 }
 
 fn main() {
-    let (dependencies, infos) = rust_playground_top_crates::generate_info();
+    let mut f = File::open("crate-modifications.toml")
+        .expect("unable to open crate modifications file");
+
+    let mut d = Vec::new();
+    f.read_to_end(&mut d)
+        .expect("unable to read crate modifications file");
+
+    let modifications: Modifications = toml::from_slice(&d).expect("unable to parse crate modifications file");
+
+    let (dependencies, infos) = rust_playground_top_crates::generate_info(&modifications);
 
     // Construct playground's Cargo.toml.
     let manifest = TomlManifest {