2015-03-07 16:46:35 -06:00
|
|
|
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
|
|
|
#![feature(box_syntax)]
|
|
|
|
#![feature(box_patterns)]
|
|
|
|
#![feature(rustc_private)]
|
|
|
|
#![feature(collections)]
|
|
|
|
#![feature(exit_status)]
|
2015-04-13 20:00:46 -05:00
|
|
|
#![feature(str_char)]
|
2015-03-07 16:46:35 -06:00
|
|
|
|
2015-03-08 23:18:48 -05:00
|
|
|
// TODO we're going to allocate a whole bunch of temp Strings, is it worth
|
|
|
|
// keeping some scratch mem for this and running our own StrPool?
|
2015-04-13 20:00:46 -05:00
|
|
|
// TODO for lint violations of names, emit a refactor script
|
|
|
|
|
|
|
|
// TODO priorities
|
2015-04-20 16:38:16 -05:00
|
|
|
// Fix fns and methods properly
|
2015-04-22 23:22:48 -05:00
|
|
|
// dead spans (comments) - in where clause (wait for fixed spans, test)
|
2015-04-20 19:02:30 -05:00
|
|
|
//
|
2015-04-13 20:00:46 -05:00
|
|
|
// Smoke testing till we can use it
|
2015-04-21 05:50:43 -05:00
|
|
|
// take config options from a file
|
2015-03-08 23:18:48 -05:00
|
|
|
|
2015-03-07 16:46:35 -06:00
|
|
|
#[macro_use]
|
|
|
|
extern crate log;
|
|
|
|
|
|
|
|
extern crate getopts;
|
|
|
|
extern crate rustc;
|
|
|
|
extern crate rustc_driver;
|
|
|
|
extern crate syntax;
|
|
|
|
|
2015-04-13 20:12:56 -05:00
|
|
|
extern crate strings;
|
|
|
|
|
2015-03-07 16:46:35 -06:00
|
|
|
use rustc::session::Session;
|
|
|
|
use rustc::session::config::{self, Input};
|
|
|
|
use rustc_driver::{driver, CompilerCalls, Compilation};
|
|
|
|
|
2015-04-21 04:01:19 -05:00
|
|
|
use syntax::ast;
|
|
|
|
use syntax::codemap::CodeMap;
|
2015-03-07 16:46:35 -06:00
|
|
|
use syntax::diagnostics;
|
|
|
|
use syntax::visit;
|
|
|
|
|
2015-03-09 01:17:14 -05:00
|
|
|
use std::path::PathBuf;
|
2015-04-22 23:22:48 -05:00
|
|
|
use std::collections::HashMap;
|
2015-03-07 16:46:35 -06:00
|
|
|
|
|
|
|
use changes::ChangeSet;
|
2015-04-21 04:01:19 -05:00
|
|
|
use visitor::FmtVisitor;
|
2015-03-07 16:46:35 -06:00
|
|
|
|
|
|
|
mod changes;
|
2015-04-21 04:01:19 -05:00
|
|
|
mod visitor;
|
2015-04-20 23:47:15 -05:00
|
|
|
mod functions;
|
|
|
|
mod missed_spans;
|
|
|
|
mod lists;
|
2015-04-21 04:01:19 -05:00
|
|
|
mod utils;
|
|
|
|
mod types;
|
|
|
|
mod expr;
|
|
|
|
mod imports;
|
2015-03-07 16:46:35 -06:00
|
|
|
|
|
|
|
const IDEAL_WIDTH: usize = 80;
|
2015-03-08 23:18:48 -05:00
|
|
|
const LEEWAY: usize = 5;
|
2015-03-07 16:46:35 -06:00
|
|
|
const MAX_WIDTH: usize = 100;
|
|
|
|
const MIN_STRING: usize = 10;
|
2015-04-13 20:00:46 -05:00
|
|
|
const TAB_SPACES: usize = 4;
|
2015-04-20 19:02:30 -05:00
|
|
|
const FN_BRACE_STYLE: BraceStyle = BraceStyle::SameLineWhere;
|
|
|
|
const FN_RETURN_INDENT: ReturnIndent = ReturnIndent::WithArgs;
|
2015-04-22 23:22:48 -05:00
|
|
|
// When we get scoped annotations, we should have rustfmt::skip.
|
|
|
|
const SKIP_ANNOTATION: &'static str = "rustfmt_skip";
|
2015-04-20 19:02:30 -05:00
|
|
|
|
2015-04-22 23:22:48 -05:00
|
|
|
#[derive(Copy, Clone)]
|
2015-04-20 23:28:10 -05:00
|
|
|
pub enum WriteMode {
|
|
|
|
Overwrite,
|
|
|
|
// str is the extension of the new file
|
|
|
|
NewFile(&'static str),
|
|
|
|
// Write the output to stdout.
|
|
|
|
Display,
|
2015-04-22 23:22:48 -05:00
|
|
|
// Return the result as a mapping from filenames to StringBuffers.
|
|
|
|
Return(&'static Fn(HashMap<String, String>)),
|
2015-04-20 23:28:10 -05:00
|
|
|
}
|
|
|
|
|
2015-04-20 19:02:30 -05:00
|
|
|
#[derive(Copy, Clone, Eq, PartialEq, Debug)]
|
|
|
|
enum BraceStyle {
|
|
|
|
AlwaysNextLine,
|
|
|
|
PreferSameLine,
|
|
|
|
// Prefer same line except where there is a where clause, in which case force
|
|
|
|
// the brace to the next line.
|
|
|
|
SameLineWhere,
|
|
|
|
}
|
|
|
|
|
|
|
|
// How to indent a function's return type.
|
|
|
|
#[derive(Copy, Clone, Eq, PartialEq, Debug)]
|
|
|
|
enum ReturnIndent {
|
|
|
|
// Aligned with the arguments
|
|
|
|
WithArgs,
|
|
|
|
// Aligned with the where clause
|
|
|
|
WithWhereClause,
|
|
|
|
}
|
2015-03-07 16:46:35 -06:00
|
|
|
|
|
|
|
// Formatting which depends on the AST.
|
|
|
|
fn fmt_ast<'a>(krate: &ast::Crate, codemap: &'a CodeMap) -> ChangeSet<'a> {
|
2015-03-08 23:18:48 -05:00
|
|
|
let mut visitor = FmtVisitor::from_codemap(codemap);
|
2015-03-07 16:46:35 -06:00
|
|
|
visit::walk_crate(&mut visitor, krate);
|
2015-03-08 23:18:48 -05:00
|
|
|
let files = codemap.files.borrow();
|
|
|
|
if let Some(last) = files.last() {
|
|
|
|
visitor.format_missing(last.end_pos);
|
|
|
|
}
|
2015-03-07 16:46:35 -06:00
|
|
|
|
|
|
|
visitor.changes
|
|
|
|
}
|
|
|
|
|
2015-04-21 05:50:43 -05:00
|
|
|
// Formatting done on a char by char or line by line basis.
|
|
|
|
// TODO warn on TODOs and FIXMEs without an issue number
|
|
|
|
// TODO warn on bad license
|
|
|
|
// TODO other stuff for parity with make tidy
|
2015-03-07 16:46:35 -06:00
|
|
|
fn fmt_lines(changes: &mut ChangeSet) {
|
|
|
|
// Iterate over the chars in the change set.
|
|
|
|
for (f, text) in changes.text() {
|
|
|
|
let mut trims = vec![];
|
2015-04-13 20:00:46 -05:00
|
|
|
let mut last_wspace: Option<usize> = None;
|
2015-03-07 16:46:35 -06:00
|
|
|
let mut line_len = 0;
|
|
|
|
let mut cur_line = 1;
|
|
|
|
for (c, b) in text.chars() {
|
|
|
|
if c == '\n' { // TOOD test for \r too
|
|
|
|
// Check for (and record) trailing whitespace.
|
|
|
|
if let Some(lw) = last_wspace {
|
2015-03-08 23:18:48 -05:00
|
|
|
trims.push((cur_line, lw, b));
|
2015-03-07 16:46:35 -06:00
|
|
|
line_len -= b - lw;
|
|
|
|
}
|
|
|
|
// Check for any line width errors we couldn't correct.
|
|
|
|
if line_len > MAX_WIDTH {
|
2015-04-21 05:50:43 -05:00
|
|
|
// TODO store the error rather than reporting immediately.
|
2015-03-07 16:46:35 -06:00
|
|
|
println!("Rustfmt couldn't fix (sorry). {}:{}: line longer than {} characters",
|
|
|
|
f, cur_line, MAX_WIDTH);
|
|
|
|
}
|
|
|
|
line_len = 0;
|
|
|
|
cur_line += 1;
|
|
|
|
last_wspace = None;
|
|
|
|
} else {
|
|
|
|
line_len += 1;
|
|
|
|
if c.is_whitespace() {
|
|
|
|
if last_wspace.is_none() {
|
|
|
|
last_wspace = Some(b);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
last_wspace = None;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-08 23:18:48 -05:00
|
|
|
for &(l, _, _) in trims.iter() {
|
2015-04-21 05:50:43 -05:00
|
|
|
// TODO store the error rather than reporting immediately.
|
2015-03-08 23:18:48 -05:00
|
|
|
println!("Rustfmt left trailing whitespace at {}:{} (sorry)", f, l);
|
2015-03-07 16:46:35 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
struct RustFmtCalls {
|
2015-03-09 01:17:14 -05:00
|
|
|
input_path: Option<PathBuf>,
|
2015-04-22 23:22:48 -05:00
|
|
|
write_mode: WriteMode,
|
2015-03-07 16:46:35 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> CompilerCalls<'a> for RustFmtCalls {
|
|
|
|
fn early_callback(&mut self,
|
|
|
|
_: &getopts::Matches,
|
|
|
|
_: &diagnostics::registry::Registry)
|
|
|
|
-> Compilation {
|
|
|
|
Compilation::Continue
|
|
|
|
}
|
|
|
|
|
2015-04-20 23:49:16 -05:00
|
|
|
fn some_input(&mut self,
|
|
|
|
input: Input,
|
|
|
|
input_path: Option<PathBuf>)
|
|
|
|
-> (Input, Option<PathBuf>) {
|
2015-03-07 16:46:35 -06:00
|
|
|
match input_path {
|
|
|
|
Some(ref ip) => self.input_path = Some(ip.clone()),
|
|
|
|
_ => {
|
|
|
|
// FIXME should handle string input and write to stdout or something
|
|
|
|
panic!("No input path");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
(input, input_path)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn no_input(&mut self,
|
|
|
|
_: &getopts::Matches,
|
|
|
|
_: &config::Options,
|
2015-03-09 01:17:14 -05:00
|
|
|
_: &Option<PathBuf>,
|
|
|
|
_: &Option<PathBuf>,
|
2015-03-07 16:46:35 -06:00
|
|
|
_: &diagnostics::registry::Registry)
|
2015-03-09 01:17:14 -05:00
|
|
|
-> Option<(Input, Option<PathBuf>)> {
|
2015-03-07 16:46:35 -06:00
|
|
|
panic!("No input supplied to RustFmt");
|
|
|
|
}
|
|
|
|
|
|
|
|
fn late_callback(&mut self,
|
|
|
|
_: &getopts::Matches,
|
|
|
|
_: &Session,
|
|
|
|
_: &Input,
|
2015-03-09 01:17:14 -05:00
|
|
|
_: &Option<PathBuf>,
|
|
|
|
_: &Option<PathBuf>)
|
2015-03-07 16:46:35 -06:00
|
|
|
-> Compilation {
|
|
|
|
Compilation::Continue
|
|
|
|
}
|
|
|
|
|
|
|
|
fn build_controller(&mut self, _: &Session) -> driver::CompileController<'a> {
|
2015-04-22 23:22:48 -05:00
|
|
|
let write_mode = self.write_mode;
|
2015-03-07 16:46:35 -06:00
|
|
|
let mut control = driver::CompileController::basic();
|
|
|
|
control.after_parse.stop = Compilation::Stop;
|
2015-04-22 23:22:48 -05:00
|
|
|
control.after_parse.callback = box move |state| {
|
2015-03-07 16:46:35 -06:00
|
|
|
let krate = state.krate.unwrap();
|
|
|
|
let codemap = state.session.codemap();
|
|
|
|
let mut changes = fmt_ast(krate, codemap);
|
2015-04-23 00:04:07 -05:00
|
|
|
// For some reason, the codemap does not include terminating newlines
|
|
|
|
// so we must add one on for each file. This is sad.
|
|
|
|
changes.append_newlines();
|
2015-03-07 16:46:35 -06:00
|
|
|
fmt_lines(&mut changes);
|
|
|
|
|
|
|
|
// FIXME(#5) Should be user specified whether to show or replace.
|
2015-04-22 23:22:48 -05:00
|
|
|
let result = changes.write_all_files(write_mode);
|
2015-04-20 23:28:10 -05:00
|
|
|
|
2015-04-22 23:22:48 -05:00
|
|
|
match result {
|
|
|
|
Err(msg) => println!("Error writing files: {}", msg),
|
|
|
|
Ok(result) => {
|
|
|
|
if let WriteMode::Return(callback) = write_mode {
|
|
|
|
callback(result);
|
|
|
|
}
|
|
|
|
}
|
2015-04-20 23:28:10 -05:00
|
|
|
}
|
2015-03-07 16:46:35 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
control
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-22 23:22:48 -05:00
|
|
|
fn run(args: Vec<String>, write_mode: WriteMode) {
|
|
|
|
let mut call_ctxt = RustFmtCalls { input_path: None, write_mode: write_mode };
|
|
|
|
rustc_driver::run_compiler(&args, &mut call_ctxt);
|
|
|
|
}
|
|
|
|
|
2015-03-07 16:46:35 -06:00
|
|
|
fn main() {
|
2015-04-13 20:00:46 -05:00
|
|
|
let args: Vec<_> = std::env::args().collect();
|
2015-04-22 23:30:19 -05:00
|
|
|
//run(args, WriteMode::Display);
|
|
|
|
run(args, WriteMode::NewFile("new"));
|
2015-03-07 16:46:35 -06:00
|
|
|
std::env::set_exit_status(0);
|
2015-04-13 20:00:46 -05:00
|
|
|
|
|
|
|
// TODO unit tests
|
|
|
|
// let fmt = ListFormatting {
|
|
|
|
// tactic: ListTactic::Horizontal,
|
|
|
|
// separator: ",",
|
|
|
|
// trailing_separator: SeparatorTactic::Vertical,
|
|
|
|
// indent: 2,
|
|
|
|
// h_width: 80,
|
|
|
|
// v_width: 100,
|
|
|
|
// };
|
|
|
|
// let inputs = vec![(format!("foo"), String::new()),
|
|
|
|
// (format!("foo"), String::new()),
|
|
|
|
// (format!("foo"), String::new()),
|
|
|
|
// (format!("foo"), String::new()),
|
|
|
|
// (format!("foo"), String::new()),
|
|
|
|
// (format!("foo"), String::new()),
|
|
|
|
// (format!("foo"), String::new()),
|
|
|
|
// (format!("foo"), String::new())];
|
|
|
|
// let s = write_list(&inputs, &fmt);
|
|
|
|
// println!(" {}", s);
|
2015-03-07 16:46:35 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
// FIXME comments
|
|
|
|
// comments aren't in the AST, which makes processing them difficult, but then
|
|
|
|
// comments are complicated anyway. I think I am happy putting off tackling them
|
|
|
|
// for now. Long term the soluton is for comments to be in the AST, but that means
|
|
|
|
// only the libsyntax AST, not the rustc one, which means waiting for the ASTs
|
|
|
|
// to diverge one day....
|
|
|
|
|
|
|
|
// Once we do have comments, we just have to implement a simple word wrapping
|
|
|
|
// algorithm to keep the width under IDEAL_WIDTH. We should also convert multiline
|
|
|
|
// /* ... */ comments to // and check doc comments are in the right place and of
|
|
|
|
// the right kind.
|
2015-03-08 23:18:48 -05:00
|
|
|
|
|
|
|
// Should also make sure comments have the right indent
|
2015-04-22 23:22:48 -05:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod test {
|
|
|
|
use std::collections::HashMap;
|
|
|
|
use std::fs;
|
|
|
|
use std::io::Read;
|
|
|
|
use super::*;
|
|
|
|
use super::run;
|
|
|
|
|
|
|
|
// For now, the only supported regression tests are idempotent tests - the input and
|
|
|
|
// output must match exactly.
|
|
|
|
// TODO would be good to check for error messages and fail on them, or at least report.
|
|
|
|
#[test]
|
|
|
|
fn idempotent_tests() {
|
|
|
|
println!("Idempotent tests:");
|
|
|
|
unsafe { FAILURES = 0; }
|
|
|
|
|
|
|
|
// Get all files in the tests/idem directory
|
|
|
|
let files = fs::read_dir("tests/idem").unwrap();
|
|
|
|
// For each file, run rustfmt and collect the output
|
|
|
|
let mut count = 0;
|
|
|
|
for entry in files {
|
|
|
|
let path = entry.unwrap().path();
|
|
|
|
let file_name = path.to_str().unwrap();
|
|
|
|
println!("Testing '{}'...", file_name);
|
|
|
|
run(vec!["rustfmt".to_string(), file_name.to_string()], WriteMode::Return(HANDLE_RESULT));
|
|
|
|
count += 1;
|
|
|
|
}
|
|
|
|
// And also dogfood ourselves!
|
|
|
|
println!("Testing 'src/mod.rs'...");
|
|
|
|
run(vec!["rustfmt".to_string(), "src/mod.rs".to_string()], WriteMode::Return(HANDLE_RESULT));
|
|
|
|
count += 1;
|
|
|
|
|
|
|
|
// Display results
|
|
|
|
let fails = unsafe { FAILURES };
|
|
|
|
println!("Ran {} idempotent tests; {} failures.", count, fails);
|
|
|
|
assert!(fails == 0, "{} idempotent tests failed", fails);
|
|
|
|
}
|
|
|
|
|
|
|
|
// 'global' used by sys_tests and handle_result.
|
|
|
|
static mut FAILURES: i32 = 0;
|
|
|
|
// Ick, just needed to get a &'static to handle_result.
|
|
|
|
static HANDLE_RESULT: &'static Fn(HashMap<String, String>) = &handle_result;
|
|
|
|
|
|
|
|
// Compare output to input.
|
|
|
|
fn handle_result(result: HashMap<String, String>) {
|
|
|
|
let mut fails = 0;
|
|
|
|
|
|
|
|
for file_name in result.keys() {
|
|
|
|
let mut f = fs::File::open(file_name).unwrap();
|
|
|
|
let mut text = String::new();
|
|
|
|
f.read_to_string(&mut text).unwrap();
|
|
|
|
if result[file_name] != text {
|
|
|
|
fails += 1;
|
|
|
|
println!("Mismatch in {}.", file_name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if fails > 0 {
|
|
|
|
unsafe {
|
|
|
|
FAILURES += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|