diff options
| author | naosense <pingao777@gmail.com> | 2022-11-23 16:43:42 +0800 |
|---|---|---|
| committer | naosense <pingao777@gmail.com> | 2022-11-29 15:00:51 +0800 |
| commit | c9bf4b75cea2259ad927228c762d4cf323628ae5 (patch) | |
| tree | 0a2d791746859af5fc5363a88af012b7a1ea8780 | |
| parent | 4528aec7e9a4fdce65a5dfec3a06aad5ee1950dd (diff) | |
| download | rust-c9bf4b75cea2259ad927228c762d4cf323628ae5.tar.gz rust-c9bf4b75cea2259ad927228c762d4cf323628ae5.zip | |
resolve conflicts
| -rw-r--r-- | clippy_lints/src/lib.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index 2dc3a082277..5ce70de8810 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -564,7 +564,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: let allow_unwrap_in_tests = conf.allow_unwrap_in_tests; let suppress_restriction_lint_in_const = conf.suppress_restriction_lint_in_const; store.register_late_pass(move |_| Box::new(approx_const::ApproxConstant::new(msrv()))); - store.register_late_pass(move |_| Box::new(approx_const::ApproxConstant::new(msrv))); store.register_late_pass(move |_| { Box::new(methods::Methods::new( avoid_breaking_exported_api, |