Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
3986539d
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,发现更多精彩内容 >>
提交
3986539d
编写于
2月 04, 2018
作者:
B
bors
浏览文件
操作
浏览文件
下载
差异文件
Auto merge of #47991 - nrc:update, r=alexcrichton
Update RLS and Rustfmt r? @alexcrichton
上级
9af374ab
cec82c1b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
30 addition
and
30 deletion
+30
-30
src/Cargo.lock
src/Cargo.lock
+28
-28
src/tools/rls
src/tools/rls
+1
-1
src/tools/rustfmt
src/tools/rustfmt
+1
-1
未找到文件。
src/Cargo.lock
浏览文件 @
3986539d
...
...
@@ -1618,7 +1618,7 @@ version = "0.1.0"
[[package]]
name = "rls"
version = "0.12
4
.0"
version = "0.12
5
.0"
dependencies = [
"cargo 0.26.0",
"env_logger 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
...
...
@@ -1635,7 +1635,7 @@ dependencies = [
"rls-rustc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"rustfmt-nightly 0.3.
6
",
"rustfmt-nightly 0.3.
8
",
"serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
...
...
@@ -1723,7 +1723,7 @@ dependencies = [
[[package]]
name = "rustc-ap-rustc_cratesio_shim"
version = "
12
.0.0"
version = "
29
.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
...
...
@@ -1732,57 +1732,57 @@ dependencies = [
[[package]]
name = "rustc-ap-rustc_data_structures"
version = "
12
.0.0"
version = "
29
.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot_core 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-serialize
12
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-serialize
29
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "rustc-ap-rustc_errors"
version = "
12
.0.0"
version = "
29
.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"rustc-ap-rustc_data_structures
12
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-serialize
12
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-syntax_pos
12
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-rustc_data_structures
29
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-serialize
29
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-syntax_pos
29
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "rustc-ap-serialize"
version = "
12
.0.0"
version = "
29
.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "rustc-ap-syntax"
version = "
12
.0.0"
version = "
29
.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-rustc_cratesio_shim
12
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-rustc_data_structures
12
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-rustc_errors
12
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-serialize
12
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-syntax_pos
12
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-rustc_cratesio_shim
29
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-rustc_data_structures
29
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-rustc_errors
29
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-serialize
29
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-syntax_pos
29
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "rustc-ap-syntax_pos"
version = "
12
.0.0"
version = "
29
.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"rustc-ap-rustc_data_structures
12
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-serialize
12
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-rustc_data_structures
29
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-serialize
29
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
...
...
@@ -2207,7 +2207,7 @@ dependencies = [
[[package]]
name = "rustfmt-nightly"
version = "0.3.
6
"
version = "0.3.
8
"
dependencies = [
"cargo_metadata 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"derive-new 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
...
...
@@ -2219,8 +2219,8 @@ dependencies = [
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-rustc_errors
12
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-syntax
12
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-rustc_errors
29
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-ap-syntax
29
.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
...
...
@@ -3068,12 +3068,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum rls-rustc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "85cfb9dde19e313da3e47738008f8a472e470cc42d910b71595a9238494701f2"
"checksum rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d7c7046dc6a92f2ae02ed302746db4382e75131b9ce20ce967259f6b5867a6a"
"checksum rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ffd34691a510938bb67fe0444fb363103c73ffb31c121d1e16bc92d8945ea8ff"
"checksum rustc-ap-rustc_cratesio_shim
12.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f1a51c10af5abd5d698b7e3487e869e6d15f6feb04cbedb5c792e2824f9d845e
"
"checksum rustc-ap-rustc_data_structures
12.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1aa227490501072780d57f74b1164d361833ff8e172f817da0da2cdf2e4280cc
"
"checksum rustc-ap-rustc_errors
12.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "21ff6c6e13ac4fc04b7d4d398828b024c4b6577045cb3175b33d35fea35ff6d0
"
"checksum rustc-ap-serialize
12.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6b4e7f51e298675c2bf830f7265621a8936fb09e63b825b58144cbaac969e604
"
"checksum rustc-ap-syntax
12.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8bf5639869ba2f7fa581939cd217cb71a85506b82ad0ea520614fb0dceb2386c
"
"checksum rustc-ap-syntax_pos
12.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1c020cdb7379e1c733ae0a311ae47c748337ba584d2dd7b7f53baaae78de6f8b
"
"checksum rustc-ap-rustc_cratesio_shim
29.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ad5e562044ea78a6764dd75ae8afe4b21fde49f4548024b5fdf6345c21fb524
"
"checksum rustc-ap-rustc_data_structures
29.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c0d65325492aba7db72899e3edbab34d39af98c42ab7c7e450c9a288ffe4ad
"
"checksum rustc-ap-rustc_errors
29.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "87d4ab2e06a671b5b5c5b0359dac346f164c99d059dce6a22feb08f2f56bd182
"
"checksum rustc-ap-serialize
29.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e0745fa445ff41c4b6699936cf35ce3ca49502377dd7b3929c829594772c3a7b
"
"checksum rustc-ap-syntax
29.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "82efedabe30f393161e11214a9130edfa01ad476372d1c6f3fec1f8d30488c9d
"
"checksum rustc-ap-syntax_pos
29.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db9de2e927e280c75b8efab9c5f591ad31082d5d2c4c562c68fdba2ee77286b0
"
"checksum rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e"
"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
"checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7"
...
...
rls
@
dee42bda
比较
511321ae
...
dee42bda
Subproject commit
511321ae1c2fa3f0e334885fecf406dd6c882836
Subproject commit
dee42bda8156a28ead609080e27b02173bb9c29e
rustfmt
@
346238f4
比较
e0e3e222
...
346238f4
Subproject commit
e0e3e22248cd14ebbe0253e9720261a0328bfc59
Subproject commit
346238f49740d6c98102a6a59811b1625c73a9d7
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录