non_topologically_sorted_functions linter

cargo-dylint/tests/integration/fix.rs

@@ -10,17 +10,6 @@ use tempfile::tempdir;
 const CATEGORY: &str = "restriction";
 const LIB_NAME: &str = "const_path_join";
 
-fn workspace_metadata(path_spec: &str) -> String {
-    format!(
-        r#"
-[workspace.metadata.dylint]
-libraries = [
-    {{ path = "{path_spec}" }},
-]
-"#,
-    )
-}
-
 const MAIN_RS: &str = r#"
 fn main() {
     let _ = std::path::Path::new("..").join("target");
@@ -96,3 +85,14 @@ fn append_workspace_metadata(path: &Path) -> Result<()> {
 
     Ok(())
 }
+
+fn workspace_metadata(path_spec: &str) -> String {
+    format!(
+        r#"
+[workspace.metadata.dylint]
+libraries = [
+    {{ path = "{path_spec}" }},
+]
+"#,
+    )
+}

dylint/src/driver_builder.rs

@@ -23,32 +23,6 @@ Deleting this directory will cause Dylint to rebuild the drivers
 the next time it needs them, but will have no ill effects.
 ";
 
-fn cargo_toml(toolchain: &str, dylint_driver_spec: &str) -> String {
-    format!(
-        r#"
-[package]
-name = "dylint_driver-{toolchain}"
-version = "0.1.0"
-edition = "2018"
-
-[dependencies]
-anyhow = "1.0"
-env_logger = "0.11"
-dylint_driver = {{ {dylint_driver_spec} }}
-"#,
-    )
-}
-
-fn rust_toolchain(toolchain: &str) -> String {
-    format!(
-        r#"
-[toolchain]
-channel = "{toolchain}"
-components = ["llvm-tools-preview", "rustc-dev"]
-"#,
-    )
-}
-
 // smoelius: We need `#![feature(rustc_private)]` as it changes `dylib` linking behavior and allows
 // us to link to `rustc_driver`. See: https://github.com/rust-lang/rust/pull/122362
 const MAIN_RS: &str = r"
@@ -238,6 +212,32 @@ fn initialize(toolchain: &str, package: &Path) -> Result<()> {
     Ok(())
 }
 
+fn cargo_toml(toolchain: &str, dylint_driver_spec: &str) -> String {
+    format!(
+        r#"
+[package]
+name = "dylint_driver-{toolchain}"
+version = "0.1.0"
+edition = "2018"
+
+[dependencies]
+anyhow = "1.0"
+env_logger = "0.11"
+dylint_driver = {{ {dylint_driver_spec} }}
+"#,
+    )
+}
+
+fn rust_toolchain(toolchain: &str) -> String {
+    format!(
+        r#"
+[toolchain]
+channel = "{toolchain}"
+components = ["llvm-tools-preview", "rustc-dev"]
+"#,
+    )
+}
+
 #[allow(clippy::unwrap_used)]
 #[cfg(test)]
 mod test {

dylint/src/lib.rs

@@ -308,57 +308,6 @@ fn name_as_path(name: &str, as_path_only: bool) -> Result<Option<(String, PathBu
     Ok(None)
 }
 
-fn list_lints(opts: &opts::Dylint, resolved: &ToolchainMap) -> Result<()> {
-    for (toolchain, paths) in resolved {
-        for path in paths {
-            let driver = driver_builder::get(opts, toolchain)?;
-            let dylint_libs = serde_json::to_string(&[path])?;
-            let (name, _) =
-                parse_path_filename(path).ok_or_else(|| anyhow!("Could not parse path"))?;
-
-            print!("{name}");
-            if resolved.keys().len() >= 2 {
-                print!("@{toolchain}");
-            }
-            if paths.len() >= 2 {
-                let location = display_location(path)?;
-                print!(" ({location})");
-            }
-            println!();
-
-            // smoelius: `-W help` is the normal way to list lints, so we can be sure it
-            // gets the lints loaded. However, we don't actually use it to list the lints.
-            let mut command = dylint_driver(toolchain, &driver)?;
-            command
-                .envs([
-                    (env::DYLINT_LIBS, dylint_libs.as_str()),
-                    (env::DYLINT_LIST, "1"),
-                ])
-                .args(["rustc", "-W", "help"])
-                .success()?;
-
-            println!();
-        }
-    }
-
-    Ok(())
-}
-
-fn display_location(path: &Path) -> Result<String> {
-    let current_dir = current_dir().with_context(|| "Could not get current directory")?;
-    let Ok(path_buf) = path.canonicalize() else {
-        return Ok("<unbuilt>".to_owned());
-    };
-    let parent = path_buf
-        .parent()
-        .ok_or_else(|| anyhow!("Could not get parent directory"))?;
-    Ok(parent
-        .strip_prefix(&current_dir)
-        .unwrap_or(parent)
-        .to_string_lossy()
-        .to_string())
-}
-
 fn check_or_fix(
     opts: &opts::Dylint,
     check_opts: &opts::Check,
@@ -471,6 +420,62 @@ fn check_or_fix(
     }
 }
 
+fn list_lints(opts: &opts::Dylint, resolved: &ToolchainMap) -> Result<()> {
+    for (toolchain, paths) in resolved {
+        for path in paths {
+            let driver = driver_builder::get(opts, toolchain)?;
+            let dylint_libs = serde_json::to_string(&[path])?;
+            let (name, _) =
+                parse_path_filename(path).ok_or_else(|| anyhow!("Could not parse path"))?;
+
+            print!("{name}");
+            if resolved.keys().len() >= 2 {
+                print!("@{toolchain}");
+            }
+            if paths.len() >= 2 {
+                let location = display_location(path)?;
+                print!(" ({location})");
+            }
+            println!();
+
+            // smoelius: `-W help` is the normal way to list lints, so we can be sure it
+            // gets the lints loaded. However, we don't actually use it to list the lints.
+            let mut command = dylint_driver(toolchain, &driver)?;
+            command
+                .envs([
+                    (env::DYLINT_LIBS, dylint_libs.as_str()),
+                    (env::DYLINT_LIST, "1"),
+                ])
+                .args(["rustc", "-W", "help"])
+                .success()?;
+
+            println!();
+        }
+    }
+
+    Ok(())
+}
+
+fn display_location(path: &Path) -> Result<String> {
+    let current_dir = current_dir().with_context(|| "Could not get current directory")?;
+    let Ok(path_buf) = path.canonicalize() else {
+        return Ok("<unbuilt>".to_owned());
+    };
+    let parent = path_buf
+        .parent()
+        .ok_or_else(|| anyhow!("Could not get parent directory"))?;
+    Ok(parent
+        .strip_prefix(&current_dir)
+        .unwrap_or(parent)
+        .to_string_lossy()
+        .to_string())
+}
+
+fn clippy_disable_docs_links() -> Result<String> {
+    let val = env::var(env::CLIPPY_DISABLE_DOCS_LINKS).ok();
+    serde_json::to_string(&val).map_err(Into::into)
+}
+
 fn target_dir(opts: &opts::Dylint, toolchain: &str) -> Result<PathBuf> {
     let mut command = MetadataCommand::new();
     if let Some(path) = &opts.library_selection().manifest_path {
@@ -484,11 +489,6 @@ fn target_dir(opts: &opts::Dylint, toolchain: &str) -> Result<PathBuf> {
         .into())
 }
 
-fn clippy_disable_docs_links() -> Result<String> {
-    let val = env::var(env::CLIPPY_DISABLE_DOCS_LINKS).ok();
-    serde_json::to_string(&val).map_err(Into::into)
-}
-
 #[allow(clippy::unwrap_used)]
 #[cfg(all(test, __library_packages))]
 mod test {
@@ -511,10 +511,6 @@ mod test {
         ..Default::default()
     });
 
-    fn name_toolchain_map() -> NameToolchainMap<'static> {
-        NameToolchainMap::new(&OPTS)
-    }
-
     #[cfg_attr(dylint_lib = "general", allow(non_thread_safe_call_in_test))]
     #[test]
     fn multiple_libraries_multiple_toolchains() {
@@ -600,4 +596,8 @@ mod test {
 
         run_with_name_toolchain_map(&opts, &name_toolchain_map).unwrap();
     }
+
+    fn name_toolchain_map() -> NameToolchainMap<'static> {
+        NameToolchainMap::new(&OPTS)
+    }
 }

dylint/src/library_packages/cargo_cli/mod.rs

@@ -255,6 +255,25 @@ publish = false
     ))
 }
 
+// smoelius: `ident` is based on the function of the same name at:
+// https://github.com/rust-lang/cargo/blob/1a498b6c1c119a79d677553862bffae96b97ad7f/src/cargo/sources/git/source.rs#L136-L147
+#[allow(clippy::manual_next_back)]
+fn ident(url: &str) -> Result<String> {
+    let url = Url::parse(url)?;
+
+    let canonical_url = CanonicalUrl::new(&url)?;
+
+    let ident = canonical_url
+        .raw_canonicalized_url()
+        .path_segments()
+        .and_then(|s| s.rev().next())
+        .unwrap_or("");
+
+    let ident = if ident.is_empty() { "_empty" } else { ident };
+
+    Ok(format!("{}-{}", ident, short_hash(&canonical_url)))
+}
+
 fn inject_dummy_dependencies(
     dep_path: &Path,
     dep_name: &str,
@@ -296,25 +315,6 @@ fn cargo_metadata(path: &Path) -> Result<Metadata> {
         .map_err(Into::into)
 }
 
-// smoelius: `ident` is based on the function of the same name at:
-// https://github.com/rust-lang/cargo/blob/1a498b6c1c119a79d677553862bffae96b97ad7f/src/cargo/sources/git/source.rs#L136-L147
-#[allow(clippy::manual_next_back)]
-fn ident(url: &str) -> Result<String> {
-    let url = Url::parse(url)?;
-
-    let canonical_url = CanonicalUrl::new(&url)?;
-
-    let ident = canonical_url
-        .raw_canonicalized_url()
-        .path_segments()
-        .and_then(|s| s.rev().next())
-        .unwrap_or("");
-
-    let ident = if ident.is_empty() { "_empty" } else { ident };
-
-    Ok(format!("{}-{}", ident, short_hash(&canonical_url)))
-}
-
 fn find_accessed_subdir<'a>(
     dep_name: &str,
     checkout_path: &Path,

dylint/src/library_packages/cargo_cli/util/hex.rs

@@ -11,16 +11,6 @@ use std::fs::File;
 use std::hash::{Hash, Hasher};
 use std::io::Read;
 
-pub fn to_hex(num: u64) -> String {
-    hex::encode(num.to_le_bytes())
-}
-
-pub fn hash_u64<H: Hash>(hashable: H) -> u64 {
-    let mut hasher = StableHasher::new();
-    hashable.hash(&mut hasher);
-    Hasher::finish(&hasher)
-}
-
 pub fn hash_u64_file(mut file: &File) -> std::io::Result<u64> {
     let mut hasher = StableHasher::new();
     let mut buf = [0; 64 * 1024];
@@ -37,3 +27,13 @@ pub fn hash_u64_file(mut file: &File) -> std::io::Result<u64> {
 pub fn short_hash<H: Hash>(hashable: &H) -> String {
     to_hex(hash_u64(hashable))
 }
+
+pub fn to_hex(num: u64) -> String {
+    hex::encode(num.to_le_bytes())
+}
+
+pub fn hash_u64<H: Hash>(hashable: H) -> u64 {
+    let mut hasher = StableHasher::new();
+    hashable.hash(&mut hasher);
+    Hasher::finish(&hasher)
+}