[path_patching] Shrink size of lockfiles (#3334)

... by only plumbing local patched paths.

Change-Id: Idfaf53d93fe11776a70d706726ed4bff0bf5233e

Author: jayzhuang

crate_universe/src/api/lockfile.rs

@@ -176,7 +176,7 @@ mod test {
                     },
                     target: String::from("anyhow"),
                     alias: None,
-                    source_annotation: None,
+                    local_path: None,
                 },
                 CrateDependency {
                     id: CrateId {
@@ -185,7 +185,7 @@ mod test {
                     },
                     target: String::from("reqwest"),
                     alias: None,
-                    source_annotation: None,
+                    local_path: None,
                 },
             ],
         );

crate_universe/src/context/crate_context.rs

@@ -2,6 +2,7 @@
 
 use std::collections::{BTreeMap, BTreeSet};
 
+use camino::Utf8PathBuf;
 use cargo_metadata::{Node, Package, PackageId};
 use serde::{Deserialize, Serialize};
 
@@ -26,9 +27,10 @@ pub struct CrateDependency {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub alias: Option<String>,
 
-    /// Where to acquire the source of this dependency.
+    /// Local path of this dependency if provided. This captures local paths from both the
+    /// [dependencies] table and the [patches] table so they can be used in rendering.
     #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub(crate) source_annotation: Option<SourceAnnotation>,
+    pub(crate) local_path: Option<Utf8PathBuf>,
 }
 
 #[derive(Debug, Default, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Clone)]
@@ -390,7 +392,10 @@ impl CrateContext {
                 id: CrateId::new(pkg.name.clone(), pkg.version.clone()),
                 target,
                 alias: dep.alias,
-                source_annotation: Some(source_annotations[&dep.package_id].clone()),
+                local_path: match source_annotations.get(&dep.package_id) {
+                    Some(SourceAnnotation::Path { path }) => Some(path.clone()),
+                    _ => None,
+                },
             }
         };
 
@@ -488,7 +493,10 @@ impl CrateContext {
                     id: current_crate_id,
                     target: target.crate_name.clone(),
                     alias: None,
-                    source_annotation: source_annotations.get(&annotation.node.id).cloned(),
+                    local_path: match source_annotations.get(&annotation.node.id) {
+                        Some(SourceAnnotation::Path { path }) => Some(path.clone()),
+                        _ => None,
+                    },
                 },
                 None,
             );

crate_universe/src/context/platforms.rs

@@ -135,7 +135,7 @@ mod test {
                 id: CrateId::new("mock_crate_b".to_owned(), VERSION_ZERO_ONE_ZERO),
                 target: "mock_crate_b".to_owned(),
                 alias: None,
-                source_annotation: None,
+                local_path: None,
             },
             None,
         );
@@ -194,7 +194,7 @@ mod test {
                 id: CrateId::new("mock_crate_b".to_owned(), VERSION_ZERO_ONE_ZERO),
                 target: "mock_crate_b".to_owned(),
                 alias: None,
-                source_annotation: None,
+                local_path: None,
             },
             Some(configuration),
         );
@@ -281,7 +281,7 @@ mod test {
                 id: CrateId::new("mock_crate_b".to_owned(), VERSION_ZERO_ONE_ZERO),
                 target: "mock_crate_b".to_owned(),
                 alias: None,
-                source_annotation: None,
+                local_path: None,
             },
             Some(configuration.clone()),
         );
@@ -348,7 +348,7 @@ mod test {
                 id: CrateId::new("mock_crate_b".to_owned(), VERSION_ZERO_ONE_ZERO),
                 target: "mock_crate_b".to_owned(),
                 alias: None,
-                source_annotation: None,
+                local_path: None,
             },
             Some(configuration.clone()),
         );

crate_universe/src/rendering.rs

@@ -840,10 +840,8 @@ impl Renderer {
         extra_deps: Select<BTreeSet<Label>>,
     ) -> Select<BTreeSet<Label>> {
         Select::merge(
-            deps.map(|dep| match dep.source_annotation {
-                Some(SourceAnnotation::Path { path }) => {
-                    Label::from_str(&format!("//{}:{}", path, &dep.target)).unwrap()
-                }
+            deps.map(|dep| match dep.local_path {
+                Some(path) => Label::from_str(&format!("//{}:{}", path, &dep.target)).unwrap(),
                 _ => self.crate_label(&dep.id.name, &dep.id.version.to_string(), &dep.target),
             }),
             extra_deps,
@@ -2008,7 +2006,7 @@ mod test {
                         // this is identical to what we have in the `name` attribute
                         // which creates conflict in `render_module_build_file`
                         alias: Some("mock_crate".into()),
-                        source_annotation: None,
+                        local_path: None,
                     }])),
                     ..Default::default()
                 },

examples/crate_universe/alias_rule/cargo-bazel-lock_global_alias_annotation_none.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "a6bc08429f8b0c107b6fcc64246695850dd2aac78424adc2bbb679ece9dcc089",
+  "checksum": "c00d8f828568c40cdc8f40cab902c254cbed12bac1b4a4d322eb942852523463",
   "crates": {
     "direct-cargo-bazel-deps 0.0.1": {
       "name": "direct-cargo-bazel-deps",
@@ -29,13 +29,7 @@
           "common": [
             {
               "id": "test_data_passing_crate 0.1.0",
-              "target": "test_data_passing_crate",
-              "source_annotation": {
-                "Http": {
-                  "url": "https://static.crates.io/crates/test_data_passing_crate/0.1.0/download",
-                  "sha256": "08c67aba3a29c3dc187eaf8080107404abfaee1ae893a02c43a362343ca73286"
-                }
-              }
+              "target": "test_data_passing_crate"
             }
           ],
           "selects": {}
@@ -92,13 +86,7 @@
           "common": [
             {
               "id": "test_data_passing_crate 0.1.0",
-              "target": "build_script_build",
-              "source_annotation": {
-                "Http": {
-                  "url": "https://static.crates.io/crates/test_data_passing_crate/0.1.0/download",
-                  "sha256": "08c67aba3a29c3dc187eaf8080107404abfaee1ae893a02c43a362343ca73286"
-                }
-              }
+              "target": "build_script_build"
             }
           ],
           "selects": {}

examples/crate_universe/alias_rule/cargo-bazel-lock_global_alias_annotation_opt.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "eaa549123840ec0ed4e30e2618eabf5acb376e22fc27d4a064542a18871ba7c4",
+  "checksum": "ae447fbf37ed546be4da604984ab80a3dd1205cb0dfbdb8e9ec93c85dc44af40",
   "crates": {
     "direct-cargo-bazel-deps 0.0.1": {
       "name": "direct-cargo-bazel-deps",
@@ -29,13 +29,7 @@
           "common": [
             {
               "id": "test_data_passing_crate 0.1.0",
-              "target": "test_data_passing_crate",
-              "source_annotation": {
-                "Http": {
-                  "url": "https://static.crates.io/crates/test_data_passing_crate/0.1.0/download",
-                  "sha256": "08c67aba3a29c3dc187eaf8080107404abfaee1ae893a02c43a362343ca73286"
-                }
-              }
+              "target": "test_data_passing_crate"
             }
           ],
           "selects": {}
@@ -92,13 +86,7 @@
           "common": [
             {
               "id": "test_data_passing_crate 0.1.0",
-              "target": "build_script_build",
-              "source_annotation": {
-                "Http": {
-                  "url": "https://static.crates.io/crates/test_data_passing_crate/0.1.0/download",
-                  "sha256": "08c67aba3a29c3dc187eaf8080107404abfaee1ae893a02c43a362343ca73286"
-                }
-              }
+              "target": "build_script_build"
             }
           ],
           "selects": {}

examples/crate_universe/alias_rule/cargo-bazel-lock_global_custom_annotation_none.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "9c9f5b08c5b53471e832ea3980c57f0ebcc42f9d5ac887e4f8983b05116c2328",
+  "checksum": "8a2e7c659fdc8db88d3fddd699b0043c1f45e04b9135b8dbc981952a7d050adb",
   "crates": {
     "direct-cargo-bazel-deps 0.0.1": {
       "name": "direct-cargo-bazel-deps",
@@ -29,13 +29,7 @@
           "common": [
             {
               "id": "test_data_passing_crate 0.1.0",
-              "target": "test_data_passing_crate",
-              "source_annotation": {
-                "Http": {
-                  "url": "https://static.crates.io/crates/test_data_passing_crate/0.1.0/download",
-                  "sha256": "08c67aba3a29c3dc187eaf8080107404abfaee1ae893a02c43a362343ca73286"
-                }
-              }
+              "target": "test_data_passing_crate"
             }
           ],
           "selects": {}
@@ -92,13 +86,7 @@
           "common": [
             {
               "id": "test_data_passing_crate 0.1.0",
-              "target": "build_script_build",
-              "source_annotation": {
-                "Http": {
-                  "url": "https://static.crates.io/crates/test_data_passing_crate/0.1.0/download",
-                  "sha256": "08c67aba3a29c3dc187eaf8080107404abfaee1ae893a02c43a362343ca73286"
-                }
-              }
+              "target": "build_script_build"
             }
           ],
           "selects": {}

examples/crate_universe/alias_rule/cargo-bazel-lock_global_dbg_annotation_fastbuild.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "5df2aa0f99c263b2729d3e4cae22b488db361e9cf9b9414088eff14269310da9",
+  "checksum": "ccfebc4eadfea89a23ecb833ac82ecb39a7ad4198e0b62f99d67be4579024880",
   "crates": {
     "direct-cargo-bazel-deps 0.0.1": {
       "name": "direct-cargo-bazel-deps",
@@ -29,13 +29,7 @@
           "common": [
             {
               "id": "test_data_passing_crate 0.1.0",
-              "target": "test_data_passing_crate",
-              "source_annotation": {
-                "Http": {
-                  "url": "https://static.crates.io/crates/test_data_passing_crate/0.1.0/download",
-                  "sha256": "08c67aba3a29c3dc187eaf8080107404abfaee1ae893a02c43a362343ca73286"
-                }
-              }
+              "target": "test_data_passing_crate"
             }
           ],
           "selects": {}
@@ -92,13 +86,7 @@
           "common": [
             {
               "id": "test_data_passing_crate 0.1.0",
-              "target": "build_script_build",
-              "source_annotation": {
-                "Http": {
-                  "url": "https://static.crates.io/crates/test_data_passing_crate/0.1.0/download",
-                  "sha256": "08c67aba3a29c3dc187eaf8080107404abfaee1ae893a02c43a362343ca73286"
-                }
-              }
+              "target": "build_script_build"
             }
           ],
           "selects": {}

examples/crate_universe/alias_rule/cargo-bazel-lock_global_opt_annotation_alias.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "4eaa48f4cdf9153c59fafd2705838a4030541b350050d5c5054c206f8ed31728",
+  "checksum": "98a4f8f8b153ab0ce51838792b49a2fad1853bdf6d2515d70f9300a28ba2654e",
   "crates": {
     "direct-cargo-bazel-deps 0.0.1": {
       "name": "direct-cargo-bazel-deps",
@@ -29,13 +29,7 @@
           "common": [
             {
               "id": "test_data_passing_crate 0.1.0",
-              "target": "test_data_passing_crate",
-              "source_annotation": {
-                "Http": {
-                  "url": "https://static.crates.io/crates/test_data_passing_crate/0.1.0/download",
-                  "sha256": "08c67aba3a29c3dc187eaf8080107404abfaee1ae893a02c43a362343ca73286"
-                }
-              }
+              "target": "test_data_passing_crate"
             }
           ],
           "selects": {}
@@ -92,13 +86,7 @@
           "common": [
             {
               "id": "test_data_passing_crate 0.1.0",
-              "target": "build_script_build",
-              "source_annotation": {
-                "Http": {
-                  "url": "https://static.crates.io/crates/test_data_passing_crate/0.1.0/download",
-                  "sha256": "08c67aba3a29c3dc187eaf8080107404abfaee1ae893a02c43a362343ca73286"
-                }
-              }
+              "target": "build_script_build"
             }
           ],
           "selects": {}

examples/crate_universe/alias_rule/cargo-bazel-lock_global_opt_annotation_dbg.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "7e86e66a95ca2da280e72926a8c0d99c5911db7ef770b626cda80298e4fbb268",
+  "checksum": "8618d21e684186f1e2d2a128c36ee013065cfc1316630876655d0543b289bd3a",
   "crates": {
     "direct-cargo-bazel-deps 0.0.1": {
       "name": "direct-cargo-bazel-deps",
@@ -29,13 +29,7 @@
           "common": [
             {
               "id": "test_data_passing_crate 0.1.0",
-              "target": "test_data_passing_crate",
-              "source_annotation": {
-                "Http": {
-                  "url": "https://static.crates.io/crates/test_data_passing_crate/0.1.0/download",
-                  "sha256": "08c67aba3a29c3dc187eaf8080107404abfaee1ae893a02c43a362343ca73286"
-                }
-              }
+              "target": "test_data_passing_crate"
             }
           ],
           "selects": {}
@@ -92,13 +86,7 @@
           "common": [
             {
               "id": "test_data_passing_crate 0.1.0",
-              "target": "build_script_build",
-              "source_annotation": {
-                "Http": {
-                  "url": "https://static.crates.io/crates/test_data_passing_crate/0.1.0/download",
-                  "sha256": "08c67aba3a29c3dc187eaf8080107404abfaee1ae893a02c43a362343ca73286"
-                }
-              }
+              "target": "build_script_build"
             }
           ],
           "selects": {}