OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix test

Browse Source
This commit is contained in:
sinkuu 2017-11-03 17:24:28 +09:00
parent cad33c0306
commit be7c4b4862
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clippy_lints/src/int_plus_one.rs
View File

@ -45,6 +45,7 @@ impl LintPass for IntPlusOne {
// x + 1 <= y
// x <= y - 1
#[derive(Copy, Clone)]
enum Side {
LHS,
RHS,

12
clippy_lints/src/utils/sugg.rs
View File

@ -6,7 +6,7 @@
use rustc::hir;
use rustc::lint::{EarlyContext, LateContext, LintContext};
use rustc_errors;
use std::borrow::Cow;
use std::borrow::{Borrow, Cow};
use std::fmt::Display;
use std;
use syntax::codemap::{CharPos, Span};
@ -136,8 +136,8 @@ impl<'a> Sugg<'a> {
}
/// Convenience method to create the `<lhs> && <rhs>` suggestion.
pub fn and(self, rhs: Self) -> Sugg<'static> {
make_binop(ast::BinOpKind::And, &self, &rhs)
pub fn and<R: Borrow<Self>>(self, rhs: R) -> Sugg<'static> {
make_binop(ast::BinOpKind::And, &self, rhs.borrow())
}
/// Convenience method to create the `<lhs> as <rhs>` suggestion.
@ -162,10 +162,10 @@ impl<'a> Sugg<'a> {
/// Convenience method to create the `<lhs>..<rhs>` or `<lhs>...<rhs>`
/// suggestion.
pub fn range(self, end: Self, limit: ast::RangeLimits) -> Sugg<'static> {
pub fn range<E: Borrow<Self>>(self, end: E, limit: ast::RangeLimits) -> Sugg<'static> {
match limit {
ast::RangeLimits::HalfOpen => make_assoc(AssocOp::DotDot, &self, &end),
ast::RangeLimits::Closed => make_assoc(AssocOp::DotDotEq, &self, &end),
ast::RangeLimits::HalfOpen => make_assoc(AssocOp::DotDot, &self, end.borrow()),
ast::RangeLimits::Closed => make_assoc(AssocOp::DotDotEq, &self, end.borrow()),
}
}

4
tests/ui/methods.rs
View File

@ -1,9 +1,9 @@
#![feature(const_fn)]
#![warn(clippy, clippy_pedantic)]
#![allow(blacklisted_name, unused, print_stdout, non_ascii_literal, new_without_default, new_without_default_derive, missing_docs_in_private_items)]
#![allow(blacklisted_name, unused, print_stdout, non_ascii_literal, new_without_default,
new_without_default_derive, missing_docs_in_private_items, needless_pass_by_value)]
use std::collections::BTreeMap;
use std::collections::HashMap;