No description
Find a file
Philipp Krones a1e49f962c
Rollup merge of #5415 - nickrtorres:master, r=flip1995
Add new lint for `Result<T, E>.map_or(None, Some(T))`

Fixes #5414

PR Checklist
---
- [x] Followed lint naming conventions (the name is a bit awkward, but it seems to conform)
- [x] Added passing UI tests (including committed .stderr file)
- [x] cargo test passes locally
- [x] Executed cargo dev update_lints
- [x] Added lint documentation
- [x] Run cargo dev fmt

`Result<T, E>` has an [`ok()`](https://doc.rust-lang.org/std/result/enum.Result.html#method.ok) method that adapts a `Result<T,E>` into an `Option<T>`.
It's possible to get around this adapter by writing `Result<T,E>.map_or(None, Some)`.

This lint is implemented as a new variant of the existing [`option_map_none` lint](https://github.com/rust-lang/rust-clippy/pull/2128)
2020-04-08 15:50:20 +02:00
.cargo Deprecate util/dev in favor of cargo alias 2020-01-30 21:34:31 +01:00
.github Make limit_stderr_length a subcommand 2020-03-31 17:24:09 +02:00
clippy_dev Make lint modules private 2020-04-03 21:19:33 +02:00
clippy_dummy Fix markdown Files 2020-02-12 09:34:25 +01:00
clippy_lints Rollup merge of #5415 - nickrtorres:master, r=flip1995 2020-04-08 15:50:20 +02:00
clippy_workspace_tests a few small cleanups 2019-12-23 05:28:23 +07:00
doc Fix typo in release.md 2020-03-30 19:32:48 +02:00
etc/relicense Fix markdown Files 2020-02-12 09:34:25 +01:00
mini-macro Allow unused_extern_crates for now 2019-12-30 17:02:18 +09:00
rustc_tools_util Update Copyright year 2020-02-20 12:06:45 +01:00
src Rollup merge of #5415 - nickrtorres:master, r=flip1995 2020-04-08 15:50:20 +02:00
tests Rollup merge of #5415 - nickrtorres:master, r=flip1995 2020-04-08 15:50:20 +02:00
util Also deploy from the beta branch 2020-03-25 20:20:54 +01:00
.editorconfig Prefer 2 spaces as indent size over 4 on yaml 2020-01-10 04:34:56 +09:00
.gitattributes git attribute macros not allowed in submodules 2020-03-29 06:58:37 -07:00
.gitignore Small change to comment in .gitignore 2020-02-12 09:34:26 +01:00
.remarkrc Rename .remarkrc.json -> .remarkrc and fix file 2020-02-12 09:34:25 +01:00
build.rs clippy: bump rustc_tools util version to 0.2 2019-05-23 17:40:54 +02:00
Cargo.toml Remove git2 dependency. 2020-03-13 18:22:51 -07:00
CHANGELOG.md result_map_or_into_option: add lint to catch manually adpating Result -> Option 2020-04-04 03:17:13 -07:00
CODE_OF_CONDUCT.md Fix markdown Files 2020-02-12 09:34:25 +01:00
CONTRIBUTING.md Improve documentation 2020-03-11 06:35:46 +09:00
COPYRIGHT update license year to 2020 2020-01-15 15:00:54 +08:00
LICENSE-APACHE Add Copyright claim, where missing 2020-02-20 12:06:44 +01:00
LICENSE-MIT Add Copyright claim, where missing 2020-02-20 12:06:44 +01:00
README.md Run update_lints 2020-03-31 17:24:09 +02:00
rust-toolchain Add rust-toolchain file 2018-07-11 08:03:46 +02:00
rustfmt.toml Revert "Revert global fmt config and use rustfmt::skip" 2019-07-23 02:57:49 +08:00
setup-toolchain.sh Only /usr/bin/env is portable in shebangs. 2020-04-07 19:51:59 +00:00
triagebot.toml Allow everyone to assign labels with rustbot 2019-09-28 14:14:20 +02:00

Clippy

Clippy Test License: MIT OR Apache-2.0

A collection of lints to catch common mistakes and improve your Rust code.

There are over 350 lints included in this crate!

We have a bunch of lint categories to allow you to choose how much Clippy is supposed to annoy help you:

  • clippy::all (everything that is on by default: all the categories below except for nursery, pedantic, and cargo)
  • clippy::correctness (code that is just outright wrong or very very useless, causes hard errors by default)
  • clippy::style (code that should be written in a more idiomatic way)
  • clippy::complexity (code that does something simple but in a complex way)
  • clippy::perf (code that can be written in a faster way)
  • clippy::pedantic (lints which are rather strict, off by default)
  • clippy::nursery (new lints that aren't quite ready yet, off by default)
  • clippy::cargo (checks against the cargo manifest, off by default)

More to come, please file an issue if you have ideas!

Only the following of those categories are enabled by default:

  • clippy::style
  • clippy::correctness
  • clippy::complexity
  • clippy::perf

Other categories need to be enabled in order for their lints to be executed.

The lint list also contains "restriction lints", which are for things which are usually not considered "bad", but may be useful to turn on in specific cases. These should be used very selectively, if at all.

Table of contents:

Usage

Since this is a tool for helping the developer of a library or application write better code, it is recommended not to include Clippy as a hard dependency. Options include using it as an optional dependency, as a cargo subcommand, or as an included feature during build. These options are detailed below.

As a cargo subcommand (cargo clippy)

One way to use Clippy is by installing Clippy through rustup as a cargo subcommand.

Step 1: Install rustup

You can install rustup on supported platforms. This will help us install Clippy and its dependencies.

If you already have rustup installed, update to ensure you have the latest rustup and compiler:

rustup update

Step 2: Install Clippy

Once you have rustup and the latest stable release (at least Rust 1.29) installed, run the following command:

rustup component add clippy

If it says that it can't find the clippy component, please run rustup self update.

Step 3: Run Clippy

Now you can run Clippy by invoking the following command:

cargo clippy

Automatically applying Clippy suggestions

Some Clippy lint suggestions can be automatically applied by cargo fix. Note that this is still experimental and only supported on the nightly channel:

cargo fix -Z unstable-options --clippy

Running Clippy from the command line without installing it

To have cargo compile your crate with Clippy without Clippy installation in your code, you can use:

cargo run --bin cargo-clippy --manifest-path=path_to_clippys_Cargo.toml

Note: Be sure that Clippy was compiled with the same version of rustc that cargo invokes here!

Travis CI

You can add Clippy to Travis CI in the same way you use it locally:

language: rust
rust:
  - stable
  - beta
before_script:
  - rustup component add clippy
script:
  - cargo clippy
  # if you want the build job to fail when encountering warnings, use
  - cargo clippy -- -D warnings
  # in order to also check tests and non-default crate features, use
  - cargo clippy --all-targets --all-features -- -D warnings
  - cargo test
  # etc.

If you are on nightly, It might happen that Clippy is not available for a certain nightly release. In this case you can try to conditionally install Clippy from the Git repo.

language: rust
rust:
  - nightly
before_script:
   - rustup component add clippy --toolchain=nightly || cargo install --git https://github.com/rust-lang/rust-clippy/ --force clippy
   # etc.

Note that adding -D warnings will cause your build to fail if any warnings are found in your code. That includes warnings found by rustc (e.g. dead_code, etc.). If you want to avoid this and only cause an error for Clippy warnings, use #![deny(clippy::all)] in your code or -D clippy::all on the command line. (You can swap clippy::all with the specific lint category you are targeting.)

Configuration

Some lints can be configured in a TOML file named clippy.toml or .clippy.toml. It contains a basic variable = value mapping eg.

blacklisted-names = ["toto", "tata", "titi"]
cognitive-complexity-threshold = 30

See the list of lints for more information about which lints can be configured and the meaning of the variables.

To deactivate the “for further information visit lint-link” message you can define the CLIPPY_DISABLE_DOCS_LINKS environment variable.

Allowing/denying lints

You can add options to your code to allow/warn/deny Clippy lints:

  • the whole set of Warn lints using the clippy lint group (#![deny(clippy::all)])

  • all lints using both the clippy and clippy::pedantic lint groups (#![deny(clippy::all)], #![deny(clippy::pedantic)]). Note that clippy::pedantic contains some very aggressive lints prone to false positives.

  • only some lints (#![deny(clippy::single_match, clippy::box_vec)], etc.)

  • allow/warn/deny can be limited to a single function or module using #[allow(...)], etc.

Note: deny produces errors instead of warnings.

If you do not want to include your lint levels in your code, you can globally enable/disable lints by passing extra flags to Clippy during the run: cargo clippy -- -A clippy::lint_name will run Clippy with lint_name disabled and cargo clippy -- -W clippy::lint_name will run it with that enabled. This also works with lint groups. For example you can run Clippy with warnings for all lints enabled: cargo clippy -- -W clippy::pedantic If you care only about a single lint, you can allow all others and then explicitly reenable the lint(s) you are interested in: cargo clippy -- -Aclippy::all -Wclippy::useless_format -Wclippy::...

Contributing

If you want to contribute to Clippy, you can find more information in CONTRIBUTING.md.

License

Copyright 2014-2020 The Rust Project Developers

Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your option. Files in the project may not be copied, modified, or distributed except according to those terms.