refactor(manifest): Keep struct/impl close for easier viewing

Author: epage

src/cargo/core/manifest.rs

@@ -147,6 +147,24 @@ pub struct ManifestMetadata {
     pub rust_version: Option<RustVersion>,
 }
 
+impl ManifestMetadata {
+    /// Whether the given env var should be tracked by Cargo's dep-info.
+    pub fn should_track(env_key: &str) -> bool {
+        let keys = MetadataEnvs::keys();
+        keys.iter().any(|k| *k == env_key)
+    }
+
+    pub fn env_var<'a>(&'a self, env_key: &str) -> Option<Cow<'a, str>> {
+        MetadataEnvs::var(self, env_key)
+    }
+
+    pub fn env_vars(&self) -> impl Iterator<Item = (&'static str, Cow<'_, str>)> {
+        MetadataEnvs::keys()
+            .iter()
+            .map(|k| (*k, MetadataEnvs::var(self, k).unwrap()))
+    }
+}
+
 macro_rules! get_metadata_env {
     ($meta:ident, $field:ident) => {
         $meta.$field.as_deref().unwrap_or_default().into()
@@ -193,24 +211,6 @@ metadata_envs! {
     (readme, "CARGO_PKG_README"),
 }
 
-impl ManifestMetadata {
-    /// Whether the given env var should be tracked by Cargo's dep-info.
-    pub fn should_track(env_key: &str) -> bool {
-        let keys = MetadataEnvs::keys();
-        keys.iter().any(|k| *k == env_key)
-    }
-
-    pub fn env_var<'a>(&'a self, env_key: &str) -> Option<Cow<'a, str>> {
-        MetadataEnvs::var(self, env_key)
-    }
-
-    pub fn env_vars(&self) -> impl Iterator<Item = (&'static str, Cow<'_, str>)> {
-        MetadataEnvs::keys()
-            .iter()
-            .map(|k| (*k, MetadataEnvs::var(self, k).unwrap()))
-    }
-}
-
 #[derive(Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
 pub enum TargetKind {
     Lib(Vec<CrateType>),