Use a workspace for separate crates

Author: jyn514

.github/workflows/ci.yml

@@ -58,10 +58,10 @@ jobs:
           psql "${CRATESFYI_DATABASE_URL}"
 
       - name: Build
-        run: cargo build --locked
+        run: cargo build --all --locked
 
       - name: Test
-        run: cargo test --locked
+        run: cargo test --all --locked
 
       - name: Clean up the database
         run: docker-compose down --volumes

Cargo.toml

@@ -8,6 +8,8 @@ repository = "https://github.com/rust-lang/docs.rs"
 build = "build.rs"
 edition = "2018"
 
+[workspace]
+
 [dependencies]
 log = "0.4"
 regex = "1"

metadata/.gitignore

@@ -1,5 +1,4 @@
 #![deny(missing_docs)]
-
 // N.B. requires nightly rustdoc to document until intra-doc links are stabilized.
 //! Collect information that allows you to build a crate the same way that docs.rs would.
 //!
@@ -33,7 +32,7 @@
 //! # }
 //! ```
 
-use std::collections::{HashSet, HashMap};
+use std::collections::{HashMap, HashSet};
 use std::io;
 use std::path::Path;
 
@@ -170,7 +169,7 @@ impl Metadata {
     ///
     /// [`from_str`]: std::str::FromStr
     pub fn from_manifest<P: AsRef<Path>>(path: P) -> Result<Metadata, MetadataError> {
-        use std::{str::FromStr, fs};
+        use std::{fs, str::FromStr};
         let buf = fs::read_to_string(path)?;
         Metadata::from_str(&buf).map_err(Into::into)
     }
@@ -234,9 +233,7 @@ impl Metadata {
 
     /// Return the environment variables that should be set when building this crate.
     pub fn environment_variables(&self) -> HashMap<&'static str, String> {
-        let joined = |v: &Option<Vec<_>>| v.as_ref()
-            .map(|args| args.join(" "))
-            .unwrap_or_default();
+        let joined = |v: &Option<Vec<_>>| v.as_ref().map(|args| args.join(" ")).unwrap_or_default();
 
         let mut map = HashMap::new();
         map.insert("RUSTFLAGS", joined(&self.rustc_args));
@@ -332,8 +329,8 @@ impl Default for Metadata {
 
 #[cfg(test)]
 mod test_parsing {
-    use std::str::FromStr;
     use super::*;
+    use std::str::FromStr;
 
     #[test]
     fn test_cratesfyi_metadata() {
@@ -402,7 +399,8 @@ mod test_parsing {
             [package]
             name = "test"
         "#,
-        ).unwrap();
+        )
+        .unwrap();
         assert!(metadata.targets.is_none());
 
         // targets explicitly set to empty array
@@ -411,7 +409,8 @@ mod test_parsing {
             [package.metadata.docs.rs]
             targets = []
         "#,
-        ).unwrap();
+        )
+        .unwrap();
         assert!(metadata.targets.unwrap().is_empty());
     }
 }
@@ -616,16 +615,42 @@ mod test_calculations {
 
         // rustdocflags
         let metadata = Metadata {
-            rustdoc_args: Some(vec!["-Z".into(), "unstable-options".into(), "--static-root-path".into(), "/".into(), "--cap-lints".into(), "warn".into()]),
+            rustdoc_args: Some(vec![
+                "-Z".into(),
+                "unstable-options".into(),
+                "--static-root-path".into(),
+                "/".into(),
+                "--cap-lints".into(),
+                "warn".into(),
+            ]),
             ..Metadata::default()
         };
-        assert_eq!(metadata.environment_variables().get("RUSTDOCFLAGS").map(String::as_str), Some("-Z unstable-options --static-root-path / --cap-lints warn"));
+        assert_eq!(
+            metadata
+                .environment_variables()
+                .get("RUSTDOCFLAGS")
+                .map(String::as_str),
+            Some("-Z unstable-options --static-root-path / --cap-lints warn")
+        );
 
         // rustdocflags
         let metadata = Metadata {
-            rustc_args: Some(vec!["-Z".into(), "unstable-options".into(), "--static-root-path".into(), "/".into(), "--cap-lints".into(), "warn".into()]),
+            rustc_args: Some(vec![
+                "-Z".into(),
+                "unstable-options".into(),
+                "--static-root-path".into(),
+                "/".into(),
+                "--cap-lints".into(),
+                "warn".into(),
+            ]),
             ..Metadata::default()
         };
-        assert_eq!(metadata.environment_variables().get("RUSTFLAGS").map(String::as_str), Some("-Z unstable-options --static-root-path / --cap-lints warn"));
+        assert_eq!(
+            metadata
+                .environment_variables()
+                .get("RUSTFLAGS")
+                .map(String::as_str),
+            Some("-Z unstable-options --static-root-path / --cap-lints warn")
+        );
     }
 }