From 348d18ebd8ee5182d4705aba8341fb469f936ff5 Mon Sep 17 00:00:00 2001
From: Josh Mcguigan <joshmcg88@gmail.com>
Date: Thu, 4 Oct 2018 21:37:28 -0700
Subject: [PATCH] Removed new_ret_no_self tests from method.rs
---
tests/ui/methods.rs | 4 ++--
tests/ui/methods.stderr | 12 ++----------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/tests/ui/methods.rs b/tests/ui/methods.rs
index 883dbf589d7..ae1b1642be7 100644
--- a/tests/ui/methods.rs
+++ b/tests/ui/methods.rs
@@ -14,7 +14,7 @@
#![warn(clippy::all, clippy::pedantic, clippy::option_unwrap_used)]
#![allow(clippy::blacklisted_name, unused, clippy::print_stdout, clippy::non_ascii_literal, clippy::new_without_default,
clippy::new_without_default_derive, clippy::missing_docs_in_private_items, clippy::needless_pass_by_value,
- clippy::default_trait_access, clippy::use_self, clippy::useless_format)]
+ clippy::default_trait_access, clippy::use_self, clippy::new_ret_no_self, clippy::useless_format)]
use std::collections::BTreeMap;
use std::collections::HashMap;
@@ -43,7 +43,7 @@ impl T {
fn to_something(self) -> u32 { 0 }
- fn new(self) {}
+ fn new(self) -> Self { unimplemented!(); }
}
struct Lt<'a> {
diff --git a/tests/ui/methods.stderr b/tests/ui/methods.stderr
index 124edee6a52..307814824ea 100644
--- a/tests/ui/methods.stderr
+++ b/tests/ui/methods.stderr
@@ -23,17 +23,9 @@ error: methods called `to_*` usually take self by reference; consider choosing a
error: methods called `new` usually take no self; consider choosing a less ambiguous name
--> $DIR/methods.rs:46:12
|
-46 | fn new(self) {}
+46 | fn new(self) -> Self { unimplemented!(); }
| ^^^^
-error: methods called `new` usually return `Self`
- --> $DIR/methods.rs:46:5
- |
-46 | fn new(self) {}
- | ^^^^^^^^^^^^^^^
- |
- = note: `-D clippy::new-ret-no-self` implied by `-D warnings`
-
error: called `map(f).unwrap_or(a)` on an Option value. This can be done more directly by calling `map_or(a, f)` instead
--> $DIR/methods.rs:114:13
|
@@ -465,5 +457,5 @@ error: used unwrap() on an Option value. If you don't want to handle the None ca
|
= note: `-D clippy::option-unwrap-used` implied by `-D warnings`
-error: aborting due to 58 previous errors
+error: aborting due to 57 previous errors