Skip to content

Commit c9bf4b7

Browse files
committed
resolve conflicts
1 parent 4528aec commit c9bf4b7

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

clippy_lints/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
564564
let allow_unwrap_in_tests = conf.allow_unwrap_in_tests;
565565
let suppress_restriction_lint_in_const = conf.suppress_restriction_lint_in_const;
566566
store.register_late_pass(move |_| Box::new(approx_const::ApproxConstant::new(msrv())));
567-
store.register_late_pass(move |_| Box::new(approx_const::ApproxConstant::new(msrv)));
568567
store.register_late_pass(move |_| {
569568
Box::new(methods::Methods::new(
570569
avoid_breaking_exported_api,

0 commit comments

Comments
 (0)