Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
7a738564
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
未验证
提交
7a738564
编写于
5月 13, 2018
作者:
P
Pascal Hertleif
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update compiltest to use rustfix 0.3.1
上级
e0635188
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
6 deletion
+9
-6
src/Cargo.lock
src/Cargo.lock
+5
-4
src/tools/compiletest/Cargo.toml
src/tools/compiletest/Cargo.toml
+1
-1
src/tools/compiletest/src/runtest.rs
src/tools/compiletest/src/runtest.rs
+3
-1
未找到文件。
src/Cargo.lock
浏览文件 @
7a738564
...
...
@@ -402,7 +402,7 @@ dependencies = [
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"miow 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
"rustfix 0.
2.0
(registry+https://github.com/rust-lang/crates.io-index)",
"rustfix 0.
3.1
(registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
...
...
@@ -2282,10 +2282,11 @@ dependencies = [
[[package]]
name = "rustfix"
version = "0.
2.0
"
version = "0.
3.1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
...
...
@@ -3145,7 +3146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum rustc-rayon-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d69983f8613a9c3ba1a3bbf5e8bdf2fd5c42317b1d8dd8623ca8030173bf8a6b"
"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
"checksum rustc_version 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a54aa04a10c68c1c4eacb4337fd883b435997ede17a9385784b990777686b09a"
"checksum rustfix 0.
2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "165a212dd11124d7070892da20f71d82970ef1d1dd41cd804b70f39740a21c85
"
"checksum rustfix 0.
3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9da3cf9b79dc889a2c9879643f26d7a53e37e9361c7566b7d2787d5ace0d8396
"
"checksum same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cfb6eded0b06a0b512c8ddbcf04089138c9b4362c2f696f3c3d76039d68f3637"
"checksum schannel 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "85fd9df495640643ad2d00443b3d78aae69802ad488debab4f1dd52fc1806ade"
"checksum scoped-tls 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8674d439c964889e2476f474a3bf198cc9e199e77499960893bac5de7e9218a4"
...
...
src/tools/compiletest/Cargo.toml
浏览文件 @
7a738564
...
...
@@ -13,7 +13,7 @@ regex = "0.2"
serde
=
"1.0"
serde_json
=
"1.0"
serde_derive
=
"1.0"
rustfix
=
"0.
2
"
rustfix
=
"0.
3.1
"
[target.'cfg(unix)'.dependencies]
libc
=
"0.2"
...
...
src/tools/compiletest/src/runtest.rs
浏览文件 @
7a738564
...
...
@@ -2587,7 +2587,9 @@ fn run_ui_test(&self) {
let
unfixed_code
=
self
.load_expected_output_from_path
(
&
self
.testpaths.file
)
.unwrap
();
let
suggestions
=
get_suggestions_from_json
(
&
proc_res
.stderr
,
&
HashSet
::
new
())
.unwrap
();
let
fixed_code
=
apply_suggestions
(
&
unfixed_code
,
&
suggestions
);
let
fixed_code
=
apply_suggestions
(
&
unfixed_code
,
&
suggestions
)
.expect
(
&
format!
(
"failed to apply suggestions for {:?} with rustfix"
,
self
.testpaths.file
)
);
errors
+=
self
.compare_output
(
"fixed"
,
&
fixed_code
,
&
expected_fixed
);
}
else
if
!
expected_fixed
.is_empty
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录