Skip to content
This repository has been archived by the owner on Dec 29, 2022. It is now read-only.

Compile with newest rustc master #1036

Merged
merged 2 commits into from
Sep 4, 2018
Merged

Compile with newest rustc master #1036

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
397561f
Use clippy_lints::read_conf
Xanewok Sep 3, 2018
cf6358a
Fix Clippy opt-in with tool lints
Xanewok Sep 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/build/rustc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ use crate::build::{BufWriter, BuildResult};
use crate::config::{ClippyPreference, Config};

use std::collections::HashMap;
use std::default::Default;
use std::ffi::OsString;
use std::io;
use std::path::{Path, PathBuf};
Expand Down Expand Up @@ -71,8 +70,9 @@ crate fn rustc(
let mut clippy_args = vec!["--cfg".to_owned(), r#"feature="cargo-clippy""#.to_owned()];

if clippy_pref == ClippyPreference::OptIn {
// `OptIn`: allow clippy require `#![warn(clippy)]` override in each workspace crate
clippy_args.push("-Aclippy".to_owned());
// `OptIn`: Require explicit `#![warn(clippy::all)]` annotation in each workspace crate
clippy_args.push("-A".to_owned());
clippy_args.push("clippy::all".to_owned());
}

args.iter()
Expand Down Expand Up @@ -161,9 +161,8 @@ fn clippy_after_parse_callback(state: &mut ::rustc_driver::driver::CompileState<
);
registry.args_hidden = Some(Vec::new());

// TODO handle clippy toml config
let empty_clippy_conf = clippy_lints::Conf::default();
clippy_lints::register_plugins(&mut registry, &empty_clippy_conf);
let conf = clippy_lints::read_conf(&registry);
clippy_lints::register_plugins(&mut registry, &conf);

let Registry {
early_lint_passes,
Expand Down