X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=README.md;h=f811123f72a128cdc250ecdf7a34fe844f1e7b22;hb=faac1019840fd2b413a78c96d3bbd806d5d5ef91;hp=4322901d18a74b45f79e7b9efa2f16166cf757b6;hpb=f46f4b5f665675826bf9756c0e0896d5a5ef92d1;p=rust.git diff --git a/README.md b/README.md index 4322901d18a..f811123f72a 100644 --- a/README.md +++ b/README.md @@ -6,28 +6,14 @@ If you'd like to help out (and you should, it's a fun project!), see [Contributing.md](Contributing.md) and our [Code of Conduct](CODE_OF_CONDUCT.md). -We are changing the default style used by rustfmt. There is an ongoing [RFC -process][fmt rfcs]. The last version using the old style was 0.8.6. From 0.9 -onwards, the RFC style is the default. If you want the old style back, you can -use [legacy-rustfmt.toml](legacy-rustfmt.toml) as your rustfmt.toml. - -The current `master` branch uses libsyntax (part of the compiler). It is -published as `rustfmt-nightly`. The `syntex` branch uses Syntex instead of -libsyntax, it is published (for now) as `rustfmt`. Most development happens on -the `master` branch, however, this only supports nightly toolchains. If you use -stable or beta Rust toolchains, you must use the Syntex version (which is likely -to be a bit out of date). Version 0.1 of rustfmt-nightly is forked from version -0.9 of the syntex branch. - You can use rustfmt in Travis CI builds. We provide a minimal Travis CI configuration (see [here](#checking-style-on-a-ci-server)) and verify its status using another repository. The status of that repository's build is reported by the "travis example" badge above. - ## Quick start -You can use `rustfmt` on Rust 1.24 and above. +You can run `rustfmt` with Rust 1.24 and above. To install: @@ -88,6 +74,7 @@ rustup component add rustfmt-preview ## Installing from source To install from source (nightly required), first checkout to the tag or branch you want to install, then issue + ``` cargo install --path . ``` @@ -105,53 +92,14 @@ just need to run on the root file (usually mod.rs or lib.rs). Rustfmt can also read data from stdin. Alternatively, you can use `cargo fmt` to format all binary and library targets of your crate. -You'll probably want to specify the write mode. Currently, there are modes for -`check`, `diff`, `replace`, `overwrite`, `display`, `coverage`, `checkstyle`, and `plain`. - -* `overwrite` Is the default and overwrites the original files _without_ creating backups. -* `replace` Overwrites the original files after creating backups of the files. -* `display` Will print the formatted files to stdout. -* `plain` Also writes to stdout, but with no metadata. -* `diff` Will print a diff between the original files and formatted files to stdout. -* `check` Checks if the program's formatting matches what rustfmt would do. Silently exits - with code 0 if so, emits a diff and exits with code 1 if not. This option is - designed to be run in CI-like where a non-zero exit signifies incorrect formatting. -* `checkstyle` Will output the lines that need to be corrected as a checkstyle XML file, - that can be used by tools like Jenkins. - -The write mode can be set by passing the `--write-mode` flag on -the command line. For example `rustfmt --write-mode=display src/filename.rs` - -`cargo fmt` uses `--write-mode=overwrite` by default. - -If you want to restrict reformatting to specific sets of lines, you can -use the `--file-lines` option. Its argument is a JSON array of objects -with `file` and `range` properties, where `file` is a file name, and -`range` is an array representing a range of lines like `[7,13]`. Ranges -are 1-based and inclusive of both end points. Specifying an empty array -will result in no files being formatted. For example, - -``` -rustfmt --file-lines '[ - {"file":"src/lib.rs","range":[7,13]}, - {"file":"src/lib.rs","range":[21,29]}, - {"file":"src/foo.rs","range":[10,11]}, - {"file":"src/foo.rs","range":[15,15]}]' -``` - -would format lines `7-13` and `21-29` of `src/lib.rs`, and lines `10-11`, -and `15` of `src/foo.rs`. No other files would be formatted, even if they -are included as out of line modules from `src/lib.rs`. +You can run `rustfmt --help` for information about argument. -If `rustfmt` successfully reformatted the code it will exit with `0` exit -status. Exit status `1` signals some unexpected error, like an unknown option or -a failure to read a file. Exit status `2` is returned if there are syntax errors -in the input files. `rustfmt` can't format syntactically invalid code. Finally, -exit status `3` is returned if there are some issues which can't be resolved -automatically. For example, if you have a very long comment line `rustfmt` -doesn't split it. Instead it prints a warning and exits with `3`. +When running with `--check`, Rustfmt will exit with `0` if Rustfmt would not +make any formatting changes to the input, and `1` if Rustfmt would make changes. +In other modes, Rustfmt will exit with `1` if there was some error during +formatting (for example a parsing or internal error) and `0` if formatting +completed without error (whether or not changes were made). -You can run `rustfmt --help` for more information. ## Running Rustfmt from your editor @@ -161,13 +109,16 @@ You can run `rustfmt --help` for more information. * [Sublime Text 3](https://packagecontrol.io/packages/RustFmt) * [Atom](atom.md) * Visual Studio Code using [vscode-rust](https://github.com/editor-rs/vscode-rust), [vsc-rustfmt](https://github.com/Connorcpu/vsc-rustfmt) or [rls_vscode](https://github.com/jonathandturner/rls_vscode) through RLS. +* [IntelliJ or CLion](intellij.md) + ## Checking style on a CI server To keep your code base consistently formatted, it can be helpful to fail the CI build -when a pull request contains unformatted code. Using `--write-mode=check` instructs +when a pull request contains unformatted code. Using `--check` instructs rustfmt to exit with an error code if the input is not formatted correctly. -It will also print any found differences. +It will also print any found differences. (Older versions of Rustfmt don't +support `--check`, use `--write-mode diff`). A minimal Travis setup could look like this (requires Rust 1.24.0 or greater): @@ -176,11 +127,14 @@ language: rust before_script: - rustup component add rustfmt-preview script: -- cargo fmt --all -- --write-mode=check +- cargo fmt --all -- --check - cargo build - cargo test ``` +See [this blog post](https://medium.com/@ag_dubs/enforcing-style-in-ci-for-rust-projects-18f6b09ec69d) +for more info. + ## How to build and test `cargo build` to build. @@ -196,7 +150,7 @@ notes above on running rustfmt. Rustfmt is designed to be very configurable. You can create a TOML file called `rustfmt.toml` or `.rustfmt.toml`, place it in the project or any other parent directory and it will apply the options in that file. See `rustfmt ---config-help` for the options which are available, or if you prefer to see +--help=config` for the options which are available, or if you prefer to see visual style previews, [Configurations.md](Configurations.md). By default, Rustfmt uses a style which conforms to the [Rust style guide][style @@ -213,40 +167,34 @@ See [Configurations.md](Configurations.md) for details. * For things you do not want rustfmt to mangle, use one of ```rust - #[rustfmt_skip] // requires nightly and #![feature(custom_attribute)] in crate root + #[rustfmt::skip] // requires nightly Rust and #![feature(tool_attributes)] in crate root #[cfg_attr(rustfmt, rustfmt_skip)] // works in stable ``` * When you run rustfmt, place a file named `rustfmt.toml` or `.rustfmt.toml` in target file directory or its parents to override the default settings of rustfmt. You can generate a file containing the default configuration with - `rustfmt --dump-default-config rustfmt.toml` and customize as needed. + `rustfmt --print-config default rustfmt.toml` and customize as needed. * After successful compilation, a `rustfmt` executable can be found in the target directory. * If you're having issues compiling Rustfmt (or compile errors when trying to install), make sure you have the most recent version of Rust installed. -* If you get an error like `error while loading shared libraries` while starting - up rustfmt you should try the following: - - On Linux: - - ``` - export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib:$LD_LIBRARY_PATH - ``` +* You can change the way rustfmt emits the changes with the --emit flag: - On MacOS: + Example: ``` - export DYLD_LIBRARY_PATH=$(rustc --print sysroot)/lib:$DYLD_LIBRARY_PATH + cargo fmt -- --emit files ``` - On Windows (Git Bash/Mingw): - - ``` - export PATH=$(rustc --print sysroot)/lib/rustlib/x86_64-pc-windows-gnu/lib/:$PATH - ``` + Options: - (Substitute `x86_64` by `i686` and `gnu` by `msvc` depending on which version of rustc was used to install rustfmt). + | Flag |Description| Nightly Only | + |:---:|:---:|:---:| + | files | overwrites output to files | No | + | stdout | writes output to stdout | No | + | coverage | displays how much of the input file was processed | Yes | + | checkstyle | emits in a checkstyle format | Yes | ## License