Skip to content

Commit

Permalink
Auto merge of rust-lang#30728 - athaeryn:mention-warning-lint-group, …
Browse files Browse the repository at this point in the history
…r=Manishearth

Fixes rust-lang#30203.

This is my first time writing Rust, and I think this code could be a bit better. Any suggestions?
  • Loading branch information
bors committed Jan 7, 2016
2 parents 91b27ec + 5038d4e commit 2edb1d9
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions src/librustc_driver/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ use rustc_metadata::loader;
use rustc_metadata::cstore::CStore;
use rustc::util::common::time;

use std::cmp::max;
use std::cmp::Ordering::Equal;
use std::env;
use std::io::{self, Read, Write};
Expand Down Expand Up @@ -627,11 +628,13 @@ Available lint options:



let max_name_len = plugin_groups.iter()
.chain(&builtin_groups)
.map(|&(s, _)| s.chars().count())
.max()
.unwrap_or(0);
let max_name_len = max("warnings".len(),
plugin_groups.iter()
.chain(&builtin_groups)
.map(|&(s, _)| s.chars().count())
.max()
.unwrap_or(0));

let padded = |x: &str| {
let mut s = repeat(" ")
.take(max_name_len - x.chars().count())
Expand All @@ -643,6 +646,7 @@ Available lint options:
println!("Lint groups provided by rustc:\n");
println!(" {} {}", padded("name"), "sub-lints");
println!(" {} {}", padded("----"), "---------");
println!(" {} {}", padded("warnings"), "all built-in lints");

let print_lint_groups = |lints: Vec<(&'static str, Vec<lint::LintId>)>| {
for (name, to) in lints {
Expand Down

0 comments on commit 2edb1d9

Please sign in to comment.