Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
7bc64684
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,发现更多精彩内容 >>
提交
7bc64684
编写于
3月 06, 2018
作者:
A
Alex Crichton
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'compiletest-update' of
https://github.com/alexcrichton/rust
into update-cargo
上级
8121db33
db824b25
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
12 deletion
+15
-12
src/tools/compiletest/Cargo.toml
src/tools/compiletest/Cargo.toml
+5
-3
src/tools/compiletest/src/json.rs
src/tools/compiletest/src/json.rs
+6
-7
src/tools/compiletest/src/main.rs
src/tools/compiletest/src/main.rs
+3
-1
src/tools/compiletest/src/read2.rs
src/tools/compiletest/src/read2.rs
+1
-1
未找到文件。
src/tools/compiletest/Cargo.toml
浏览文件 @
7bc64684
...
...
@@ -10,11 +10,13 @@ filetime = "0.1"
getopts
=
"0.2"
log
=
"0.4"
regex
=
"0.2"
rustc-serialize
=
"0.3"
serde
=
"1.0"
serde_json
=
"1.0"
serde_derive
=
"1.0"
[target.'cfg(unix)'.dependencies]
libc
=
"0.2"
[target.'cfg(windows)'.dependencies]
miow
=
"0.
2
"
winapi
=
"0.2"
miow
=
"0.
3
"
winapi
=
{
version
=
"0.3"
,
features
=
["winerror"]
}
src/tools/compiletest/src/json.rs
浏览文件 @
7bc64684
...
...
@@ -9,7 +9,7 @@
// except according to those terms.
use
errors
::{
Error
,
ErrorKind
};
use
rustc_serialize
::
json
;
use
serde_
json
;
use
std
::
str
::
FromStr
;
use
std
::
path
::
Path
;
use
runtest
::
ProcRes
;
...
...
@@ -17,17 +17,16 @@
// These structs are a subset of the ones found in
// `syntax::json`.
#[derive(
RustcEncodable,
RustcDecodabl
e)]
#[derive(
Deserializ
e)]
struct
Diagnostic
{
message
:
String
,
code
:
Option
<
DiagnosticCode
>
,
level
:
String
,
spans
:
Vec
<
DiagnosticSpan
>
,
children
:
Vec
<
Diagnostic
>
,
rendered
:
Option
<
String
>
,
}
#[derive(
RustcEncodable,
RustcDecodabl
e,
Clone)]
#[derive(
Deserializ
e,
Clone)]
struct
DiagnosticSpan
{
file_name
:
String
,
line_start
:
usize
,
...
...
@@ -40,7 +39,7 @@ struct DiagnosticSpan {
expansion
:
Option
<
Box
<
DiagnosticSpanMacroExpansion
>>
,
}
#[derive(
RustcEncodable,
RustcDecodabl
e,
Clone)]
#[derive(
Deserializ
e,
Clone)]
struct
DiagnosticSpanMacroExpansion
{
/// span where macro was applied to generate this code
span
:
DiagnosticSpan
,
...
...
@@ -49,7 +48,7 @@ struct DiagnosticSpanMacroExpansion {
macro_decl_name
:
String
,
}
#[derive(
RustcEncodable,
RustcDecodabl
e,
Clone)]
#[derive(
Deserializ
e,
Clone)]
struct
DiagnosticCode
{
/// The code itself.
code
:
String
,
...
...
@@ -67,7 +66,7 @@ fn parse_line(file_name: &str, line: &str, output: &str, proc_res: &ProcRes) ->
// The compiler sometimes intermingles non-JSON stuff into the
// output. This hack just skips over such lines. Yuck.
if
line
.starts_with
(
'{'
)
{
match
json
::
decode
::
<
Diagnostic
>
(
line
)
{
match
serde_json
::
from_str
::
<
Diagnostic
>
(
line
)
{
Ok
(
diagnostic
)
=>
{
let
mut
expected_errors
=
vec!
[];
push_expected_errors
(
&
mut
expected_errors
,
&
diagnostic
,
&
[],
file_name
);
...
...
src/tools/compiletest/src/main.rs
浏览文件 @
7bc64684
...
...
@@ -21,8 +21,10 @@
extern
crate
libc
;
#[macro_use]
extern
crate
log
;
extern
crate
rustc_serialize
;
extern
crate
regex
;
#[macro_use]
extern
crate
serde_derive
;
extern
crate
serde_json
;
extern
crate
test
;
use
std
::
env
;
...
...
src/tools/compiletest/src/read2.rs
浏览文件 @
7bc64684
...
...
@@ -119,7 +119,7 @@ mod imp {
use
self
::
miow
::
iocp
::{
CompletionPort
,
CompletionStatus
};
use
self
::
miow
::
pipe
::
NamedPipe
;
use
self
::
miow
::
Overlapped
;
use
self
::
winapi
::
ERROR_BROKEN_PIPE
;
use
self
::
winapi
::
shared
::
winerror
::
ERROR_BROKEN_PIPE
;
struct
Pipe
<
'a
>
{
dst
:
&
'a
mut
Vec
<
u8
>
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录