]> git.lizzy.rs Git - rust.git/blobdiff - src/main.rs
Merge pull request #3085 from mikerite/revert-98dbce
[rust.git] / src / main.rs
index ab2b3b9a4a0306fd8b466cfb736285f6aa5c6c36..cf26549774c22c269f6973265454cb739f947fc3 100644 (file)
@@ -1,15 +1,10 @@
 // error-pattern:yummy
 #![feature(box_syntax)]
 #![feature(rustc_private)]
-#![allow(unknown_lints, missing_docs_in_private_items)]
+#![feature(tool_lints)]
+#![allow(unknown_lints, clippy::missing_docs_in_private_items)]
 
-use std::collections::HashMap;
-use std::process;
-use std::io::{self, Write};
-
-extern crate cargo_metadata;
-
-use std::path::{Path, PathBuf};
+use rustc_tools_util::*;
 
 const CARGO_CLIPPY_HELP: &str = r#"Checks a package to catch common mistakes and improve your Rust code.
 
 
 Common options:
     -h, --help               Print this message
-    --features               Features to compile for the package
     -V, --version            Print version info and exit
-    --all                    Run over all packages in the current workspace
 
-Other options are the same as `cargo rustc`.
+Other options are the same as `cargo check`.
 
 To allow or deny a lint from the command line you can use `cargo clippy --`
 with:
     #[cfg_attr(feature = "cargo-clippy", allow(needless_lifetimes))]
 "#;
 
-#[allow(print_stdout)]
+#[allow(clippy::print_stdout)]
 fn show_help() {
     println!("{}", CARGO_CLIPPY_HELP);
 }
 
-#[allow(print_stdout)]
+#[allow(clippy::print_stdout)]
 fn show_version() {
-    println!("{}", env!("CARGO_PKG_VERSION"));
+    let version_info = rustc_tools_util::get_version_info!();
+    println!("{}", version_info);
 }
 
 pub fn main() {
@@ -54,133 +48,33 @@ pub fn main() {
         show_help();
         return;
     }
+
     if std::env::args().any(|a| a == "--version" || a == "-V") {
         show_version();
         return;
     }
 
-    let manifest_path_arg = std::env::args()
-        .skip(2)
-        .find(|val| val.starts_with("--manifest-path="))
-        .map(|val| val["--manifest-path=".len()..].to_owned());
-
-    let mut metadata = if let Ok(metadata) = cargo_metadata::metadata(manifest_path_arg.as_ref().map(AsRef::as_ref)) {
-        metadata
-    } else {
-        println!("{:?}", cargo_metadata::metadata(manifest_path_arg.as_ref().map(AsRef::as_ref)));
-        let _ = io::stderr().write_fmt(format_args!("error: Could not obtain cargo metadata.\n"));
-        process::exit(101);
-    };
-
-    let manifest_path = manifest_path_arg.map(|arg| {
-        PathBuf::from(arg)
-            .canonicalize()
-            .expect("manifest path could not be canonicalized")
-    });
-
-    let packages = if std::env::args().any(|a| a == "--all") {
-        metadata.packages
-    } else {
-        let package_index = {
-            if let Some(manifest_path) = manifest_path {
-                metadata.packages.iter().position(|package| {
-                    let package_manifest_path = Path::new(&package.manifest_path)
-                        .canonicalize()
-                        .expect("package manifest path could not be canonicalized");
-                    package_manifest_path == manifest_path
-                })
-            } else {
-                let package_manifest_paths: HashMap<_, _> = metadata
-                    .packages
-                    .iter()
-                    .enumerate()
-                    .map(|(i, package)| {
-                        let package_manifest_path = Path::new(&package.manifest_path)
-                            .parent()
-                            .expect("could not find parent directory of package manifest")
-                            .canonicalize()
-                            .expect("package directory cannot be canonicalized");
-                        (package_manifest_path, i)
-                    })
-                    .collect();
-
-                let current_dir = std::env::current_dir()
-                    .expect("could not read current directory")
-                    .canonicalize()
-                    .expect("current directory cannot be canonicalized");
-
-                let mut current_path: &Path = &current_dir;
-
-                // This gets the most-recent parent (the one that takes the fewest `cd ..`s to
-                // reach).
-                loop {
-                    if let Some(&package_index) = package_manifest_paths.get(current_path) {
-                        break Some(package_index);
-                    } else {
-                        // We'll never reach the filesystem root, because to get to this point in the
-                        // code
-                        // the call to `cargo_metadata::metadata` must have succeeded. So it's okay to
-                        // unwrap the current path's parent.
-                        current_path = current_path
-                            .parent()
-                            .unwrap_or_else(|| panic!("could not find parent of path {}", current_path.display()));
-                    }
-                }
-            }
-        }.expect("could not find matching package");
-
-        vec![metadata.packages.remove(package_index)]
-    };
-
-    for package in packages {
-        let manifest_path = package.manifest_path;
-
-        for target in package.targets {
-            let args = std::env::args()
-                .skip(2)
-                .filter(|a| a != "--all" && !a.starts_with("--manifest-path="));
-
-            let args = std::iter::once(format!("--manifest-path={}", manifest_path)).chain(args);
-            if let Some(first) = target.kind.get(0) {
-                if target.kind.len() > 1 || first.ends_with("lib") {
-                    println!("lib: {}", target.name);
-                    if let Err(code) = process(std::iter::once("--lib".to_owned()).chain(args)) {
-                        std::process::exit(code);
-                    }
-                } else if ["bin", "example", "test", "bench"].contains(&&**first) {
-                    println!("{}: {}", first, target.name);
-                    if let Err(code) = process(
-                        vec![format!("--{}", first), target.name]
-                            .into_iter()
-                            .chain(args),
-                    ) {
-                        std::process::exit(code);
-                    }
-                }
-            } else {
-                panic!("badly formatted cargo metadata: target::kind is an empty array");
-            }
-        }
+    if let Err(code) = process(std::env::args().skip(2)) {
+        std::process::exit(code);
     }
 }
 
-fn process<I>(old_args: I) -> Result<(), i32>
+fn process<I>(mut old_args: I) -> Result<(), i32>
 where
     I: Iterator<Item = String>,
 {
-    let mut args = vec!["rustc".to_owned()];
+    let mut args = vec!["check".to_owned()];
 
     let mut found_dashes = false;
-    for arg in old_args {
+    for arg in old_args.by_ref() {
         found_dashes |= arg == "--";
+        if found_dashes {
+            break;
+        }
         args.push(arg);
     }
-    if !found_dashes {
-        args.push("--".to_owned());
-    }
-    args.push("--emit=metadata".to_owned());
-    args.push("--cfg".to_owned());
-    args.push(r#"feature="cargo-clippy""#.to_owned());
+
+    let clippy_args: String = old_args.map(|arg| format!("{}__CLIPPY_HACKERY__", arg)).collect();
 
     let mut path = std::env::current_exe()
         .expect("current executable path invalid")
@@ -188,9 +82,29 @@ fn process<I>(old_args: I) -> Result<(), i32>
     if cfg!(windows) {
         path.set_extension("exe");
     }
+
+    let target_dir = std::env::var_os("CLIPPY_DOGFOOD")
+        .map(|_| {
+            std::env::var_os("CARGO_MANIFEST_DIR").map_or_else(
+                || {
+                    let mut fallback = std::ffi::OsString::new();
+                    fallback.push("clippy_dogfood");
+                    fallback
+                },
+                |d| {
+                    std::path::PathBuf::from(d)
+                        .join("target")
+                        .join("dogfood")
+                        .into_os_string()
+                },
+            )
+        }).map(|p| ("CARGO_TARGET_DIR", p));
+
     let exit_status = std::process::Command::new("cargo")
         .args(&args)
         .env("RUSTC_WRAPPER", path)
+        .env("CLIPPY_ARGS", clippy_args)
+        .envs(target_dir)
         .spawn()
         .expect("could not run cargo")
         .wait()