Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
7e320595
R
Rust
项目概览
int
/
Rust
大约 1 年 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7e320595
编写于
7月 15, 2018
作者:
B
bors
浏览文件
操作
浏览文件
下载
差异文件
Auto merge of #52388 - oli-obk:clippy, r=Manishearth
Update clippy and rls r? @Manishearth cc @kennytm @nrc
上级
49f1e5d8
0ad54535
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
24 addition
and
30 deletion
+24
-30
src/Cargo.lock
src/Cargo.lock
+17
-22
src/Cargo.toml
src/Cargo.toml
+0
-1
src/librustc/hir/mod.rs
src/librustc/hir/mod.rs
+2
-2
src/libsyntax/ast.rs
src/libsyntax/ast.rs
+3
-3
src/tools/clippy
src/tools/clippy
+1
-1
src/tools/rls
src/tools/rls
+1
-1
未找到文件。
src/Cargo.lock
浏览文件 @
7e320595
...
...
@@ -301,13 +301,13 @@ dependencies = [
[[package]]
name = "clippy"
version = "0.0.21
1
"
version = "0.0.21
2
"
dependencies = [
"ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"cargo_metadata 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
"clippy-mini-macro-test 0.2.0",
"clippy_lints 0.0.21
1
",
"clippy_lints 0.0.21
2
",
"compiletest_rs 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"derive-new 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
...
...
@@ -326,7 +326,7 @@ version = "0.2.0"
[[package]]
name = "clippy_lints"
version = "0.0.21
1
"
version = "0.0.21
2
"
dependencies = [
"cargo_metadata 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
"if_chain 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
...
...
@@ -604,14 +604,6 @@ dependencies = [
"log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "enum_primitive"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "env_logger"
version = "0.5.10"
...
...
@@ -994,11 +986,12 @@ dependencies = [
[[package]]
name = "languageserver-types"
version = "0.4
3
.0"
version = "0.4
5
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"num-derive 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.69 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.69 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
...
...
@@ -1249,16 +1242,19 @@ version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "num-
integer
"
version = "0.
1.39
"
name = "num-
derive
"
version = "0.
2.2
"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "num-
traits
"
version = "0.1.
43
"
name = "num-
integer
"
version = "0.1.
39
"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
...
...
@@ -1665,13 +1661,13 @@ version = "0.129.0"
dependencies = [
"cargo 0.30.0",
"cargo_metadata 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
"clippy_lints 0.0.21
1
",
"clippy_lints 0.0.21
2
",
"env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
"json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-core 8.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"languageserver-types 0.4
3
.0 (registry+https://github.com/rust-lang/crates.io-index)",
"languageserver-types 0.4
5
.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
...
...
@@ -3063,7 +3059,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0"
"checksum elasticlunr-rs 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4837d77a1e157489a3933b743fd774ae75074e0e390b2b7f071530048a0d87ee"
"checksum ena 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "88dc8393b3c7352f94092497f6b52019643e493b6b890eb417cdb7c46117e621"
"checksum enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180"
"checksum env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0e6e40ebb0e66918a37b38c7acab4e10d299e0463fe2af5d29b9cc86710cfd2a"
"checksum environment 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f4b14e20978669064c33b4c1e0fb4083412e40fe56cbea2eae80fd7591503ee"
"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
...
...
@@ -3102,7 +3097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9ad0485404155f45cce53a40d4b2d6ac356418300daed05273d9e26f91c390be"
"checksum jsonrpc-core 8.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ddf83704f4e79979a424d1082dd2c1e52683058056c9280efa19ac5f6bc9033c"
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
"checksum languageserver-types 0.4
3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dedb2c8010c9c7530b205fd16ed24a158c3a46634cb0fc61528b17cbbb55df1a
"
"checksum languageserver-types 0.4
5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d91d91d1c23db74187096d191967cb49f49bb175ad6d855fa9229d16ef2c982
"
"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
"checksum lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e6412c5e2ad9584b0b8e979393122026cdd6d2a80b933f890dcd694ddbe73739"
"checksum lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6f08839bc70ef4a3fe1d566d5350f519c5912ea86be0df1740a7d247c7fc0ef"
...
...
@@ -3127,8 +3122,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum miow 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9224c91f82b3c47cf53dcf78dfaa20d6888fbcc5d272d5f2fcdf8a697f3c987d"
"checksum new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0cdc457076c78ab54d5e0d6fa7c47981757f1e34dc39ff92787f217dede586c4"
"checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
"checksum num-derive 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d2c31b75c36a993d30c7a13d70513cb93f02acafdd5b7ba250f9b0e18615de7"
"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
"checksum num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "630de1ef5cc79d0cdd78b7e33b81f083cbfe90de0f4b2b2f07f905867c70e9fe"
"checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30"
"checksum open 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c281318d992e4432cfa799969467003d05921582a7489a8325e37f8a450d5113"
...
...
src/Cargo.toml
浏览文件 @
7e320595
...
...
@@ -71,5 +71,4 @@ cargo = { path = "tools/cargo" }
rustfmt-nightly
=
{
path
=
"tools/rustfmt"
}
[patch."https://github.com/rust-lang-nursery/rust-clippy"]
clippy
=
{
path
=
"tools/clippy"
}
clippy_lints
=
{
path
=
"tools/clippy/clippy_lints"
}
src/librustc/hir/mod.rs
浏览文件 @
7e320595
...
...
@@ -940,7 +940,7 @@ pub fn and(self, other: Self) -> Self {
}
}
#[derive(Clone,
PartialEq,
RustcEncodable,
RustcDecodable,
Debug,
Copy)]
#[derive(Clone,
PartialEq,
RustcEncodable,
RustcDecodable,
Debug,
Copy
,
Hash
)]
pub
enum
BinOp_
{
/// The `+` operator (addition)
BiAdd
,
...
...
@@ -1069,7 +1069,7 @@ fn into(self) -> ast::BinOpKind {
pub
type
BinOp
=
Spanned
<
BinOp_
>
;
#[derive(Clone,
PartialEq,
RustcEncodable,
RustcDecodable,
Debug,
Copy)]
#[derive(Clone,
PartialEq,
RustcEncodable,
RustcDecodable,
Debug,
Copy
,
Hash
)]
pub
enum
UnOp
{
/// The `*` operator for dereferencing
UnDeref
,
...
...
src/libsyntax/ast.rs
浏览文件 @
7e320595
...
...
@@ -1248,7 +1248,7 @@ pub fn stream(&self) -> TokenStream {
}
}
#[derive(Clone,
RustcEncodable,
RustcDecodable,
Debug,
Copy)]
#[derive(Clone,
RustcEncodable,
RustcDecodable,
Debug,
Copy
,
Hash,
PartialEq
)]
pub
enum
StrStyle
{
/// A regular string, like `"foo"`
Cooked
,
...
...
@@ -1261,7 +1261,7 @@ pub enum StrStyle {
/// A literal
pub
type
Lit
=
Spanned
<
LitKind
>
;
#[derive(Clone,
RustcEncodable,
RustcDecodable,
Debug,
Copy)]
#[derive(Clone,
RustcEncodable,
RustcDecodable,
Debug,
Copy
,
Hash,
PartialEq
)]
pub
enum
LitIntType
{
Signed
(
IntTy
),
Unsigned
(
UintTy
),
...
...
@@ -1271,7 +1271,7 @@ pub enum LitIntType {
/// Literal kind.
///
/// E.g. `"foo"`, `42`, `12.34` or `bool`
#[derive(Clone,
RustcEncodable,
RustcDecodable,
Debug)]
#[derive(Clone,
RustcEncodable,
RustcDecodable,
Debug
,
Hash,
PartialEq
)]
pub
enum
LitKind
{
/// A string literal (`"foo"`)
Str
(
Symbol
,
StrStyle
),
...
...
clippy
@
5e085e43
比较
aad450ef
...
5e085e43
Subproject commit
aad450ef923091ba4699891df0fe518f0d3686f6
Subproject commit
5e085e43104f6748a9717bb78de8b634712638b4
rls
@
2b578510
比较
6b4238b4
...
2b578510
Subproject commit
6b4238b46595de1660a95887b287ddabe62726ea
Subproject commit
2b57851099ffbdaecb26cdecd47fa3477e3b75a6
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录