Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
db824b25
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,发现更多精彩内容 >>
提交
db824b25
编写于
3月 06, 2018
作者:
A
Alex Crichton
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update compiletest's dependencies
Drop rustc-serialize, add winapi 0.3 and Serde!
上级
2789b067
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
30 addition
and
15 deletion
+30
-15
src/Cargo.lock
src/Cargo.lock
+15
-3
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/Cargo.lock
浏览文件 @
db824b25
...
...
@@ -398,10 +398,12 @@ dependencies = [
"getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"miow 0.
2
.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.5 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.2.8 (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)",
"winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
...
...
@@ -1176,6 +1178,15 @@ dependencies = [
"ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "miow"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"socket2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "miri"
version = "0.1.0"
...
...
@@ -2929,6 +2940,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
"checksum miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "609ce024854aeb19a0ef7567d348aaa5a746b32fb72e336df7fcc16869d7e2b4"
"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
"checksum miow 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9224c91f82b3c47cf53dcf78dfaa20d6888fbcc5d272d5f2fcdf8a697f3c987d"
"checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09"
"checksum nibble_vec 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "62e678237a4c70c5f2b917cefd7d080dfbf800421f06e8a59d4e28ef5130fd9e"
"checksum nix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "47e49f6982987135c5e9620ab317623e723bd06738fd85377e8d55f57c8b6487"
...
...
src/tools/compiletest/Cargo.toml
浏览文件 @
db824b25
...
...
@@ -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
浏览文件 @
db824b25
...
...
@@ -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
浏览文件 @
db824b25
...
...
@@ -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
浏览文件 @
db824b25
...
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录