Skip to content

Commit 6d9516a

Browse files
committed
Auto merge of #11758 - y21:clippy_config_references, r=flip1995
update references of old `msrvs` and `conf` paths In #11685, `clippy_lints::utils::conf` and `clippy_utils::msrvs` were moved to a separate `clippy_config` crate. I noticed that not all references to those paths were updated, so this small PR intends to fix those. changelog: none
2 parents 789bc73 + b9efa3e commit 6d9516a

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

book/src/development/adding_lints.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ need to ensure that the MSRV configured for the project is >= the MSRV of the
436436
required Rust feature. If multiple features are required, just use the one with
437437
a lower MSRV.
438438

439-
First, add an MSRV alias for the required feature in [`clippy_utils::msrvs`].
439+
First, add an MSRV alias for the required feature in [`clippy_config::msrvs`].
440440
This can be accessed later as `msrvs::STR_STRIP_PREFIX`, for example.
441441

442442
```rust
@@ -506,7 +506,7 @@ fn msrv_1_45() {
506506
```
507507

508508
As a last step, the lint should be added to the lint documentation. This is done
509-
in `clippy_lints/src/utils/conf.rs`:
509+
in `clippy_config/src/conf.rs`:
510510

511511
```rust
512512
define_Conf! {
@@ -516,7 +516,7 @@ define_Conf! {
516516
}
517517
```
518518

519-
[`clippy_utils::msrvs`]: https://doc.rust-lang.org/nightly/nightly-rustc/clippy_utils/msrvs/index.html
519+
[`clippy_config::msrvs`]: https://doc.rust-lang.org/nightly/nightly-rustc/clippy_config/msrvs/index.html
520520

521521
## Author lint
522522

@@ -657,7 +657,7 @@ Adding a configuration to a lint can be useful for
657657
thresholds or to constrain some behavior that can be seen as a false positive
658658
for some users. Adding a configuration is done in the following steps:
659659

660-
1. Adding a new configuration entry to [`clippy_lints::utils::conf`] like this:
660+
1. Adding a new configuration entry to [`clippy_config::conf`] like this:
661661

662662
```rust,ignore
663663
/// Lint: LINT_NAME.
@@ -736,7 +736,7 @@ for some users. Adding a configuration is done in the following steps:
736736

737737
Run `cargo collect-metadata` to generate documentation changes for the book.
738738

739-
[`clippy_lints::utils::conf`]: https://github.com/rust-lang/rust-clippy/blob/master/clippy_lints/src/utils/conf.rs
739+
[`clippy_config::conf`]: https://github.com/rust-lang/rust-clippy/blob/master/clippy_config/src/conf.rs
740740
[`clippy_lints` lib file]: https://github.com/rust-lang/rust-clippy/blob/master/clippy_lints/src/lib.rs
741741
[`tests/ui`]: https://github.com/rust-lang/rust-clippy/blob/master/tests/ui
742742
[`tests/ui-toml`]: https://github.com/rust-lang/rust-clippy/blob/master/tests/ui-toml

clippy_dev/src/new_lint.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,8 @@ fn get_lint_file_contents(lint: &LintData<'_>, enable_msrv: bool) -> String {
320320
extract_msrv_attr!({context_import});
321321
}}
322322
323-
// TODO: Add MSRV level to `clippy_utils/src/msrvs.rs` if needed.
324-
// TODO: Update msrv config comment in `clippy_lints/src/utils/conf.rs`
323+
// TODO: Add MSRV level to `clippy_config/src/msrvs.rs` if needed.
324+
// TODO: Update msrv config comment in `clippy_config/src/conf.rs`
325325
"#
326326
)
327327
} else {

clippy_lints/src/types/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ impl Types {
490490
// All lints that are being checked in this block are guarded by
491491
// the `avoid_breaking_exported_api` configuration. When adding a
492492
// new lint, please also add the name to the configuration documentation
493-
// in `clippy_lints::utils::conf.rs`
493+
// in `clippy_config::conf`
494494

495495
let mut triggered = false;
496496
triggered |= box_collection::check(cx, hir_ty, qpath, def_id);

0 commit comments

Comments
 (0)