Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
d1d9cfc7
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,发现更多精彩内容 >>
未验证
提交
d1d9cfc7
编写于
11月 03, 2017
作者:
O
Oliver Schneider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Don't add a new -Z flag, reuse -Zunstable-options
上级
c7cb2cf8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
56 addition
and
58 deletion
+56
-58
src/librustc/session/config.rs
src/librustc/session/config.rs
+54
-56
src/test/ui/lint/unused_parens_json_suggestion.rs
src/test/ui/lint/unused_parens_json_suggestion.rs
+1
-1
src/test/ui/lint/use_suggestion_json.rs
src/test/ui/lint/use_suggestion_json.rs
+1
-1
未找到文件。
src/librustc/session/config.rs
浏览文件 @
d1d9cfc7
...
...
@@ -1104,8 +1104,6 @@ fn parse_optimization_fuel(slot: &mut Option<(String, u64)>, v: Option<&str>) ->
"enable ThinLTO when possible"
),
inline_in_all_cgus
:
Option
<
bool
>
=
(
None
,
parse_opt_bool
,
[
TRACKED
],
"control whether #[inline] functions are in all cgus"
),
pretty_json_error_format
:
bool
=
(
false
,
parse_bool
,
[
UNTRACKED
],
"allow `--error-format=pretty-json` (used for compiletest)"
),
}
pub
fn
default_lib_output
()
->
CrateType
{
...
...
@@ -1477,7 +1475,7 @@ pub fn build_session_options_and_crate_config(matches: &getopts::Matches)
let
debugging_opts
=
build_debugging_options
(
matches
,
error_format
);
if
!
debugging_opts
.
pretty_json_error_format
&&
error_format
==
ErrorOutputType
::
Json
(
true
)
{
if
!
debugging_opts
.
unstable_options
&&
error_format
==
ErrorOutputType
::
Json
(
true
)
{
early_error
(
ErrorOutputType
::
Json
(
false
),
"--error-format=pretty-json is unstable
\
(use -Zpretty-json-error-format)"
);
}
...
...
@@ -2262,46 +2260,46 @@ fn test_search_paths_tracking_hash_different_values() {
let
mut
v5
=
super
::
basic_options
();
// Reference
v1
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
);
v1
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
);
v1
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
);
v1
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
);
v1
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
);
v1
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v1
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v1
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v1
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v1
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
// Native changed
v2
.search_paths
.add_path
(
"native=XXX"
,
super
::
ErrorOutputType
::
Json
);
v2
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
);
v2
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
);
v2
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
);
v2
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
);
v2
.search_paths
.add_path
(
"native=XXX"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v2
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v2
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v2
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v2
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
// Crate changed
v2
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
);
v2
.search_paths
.add_path
(
"crate=XXX"
,
super
::
ErrorOutputType
::
Json
);
v2
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
);
v2
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
);
v2
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
);
v2
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v2
.search_paths
.add_path
(
"crate=XXX"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v2
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v2
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v2
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
// Dependency changed
v3
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
);
v3
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
);
v3
.search_paths
.add_path
(
"dependency=XXX"
,
super
::
ErrorOutputType
::
Json
);
v3
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
);
v3
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
);
v3
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v3
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v3
.search_paths
.add_path
(
"dependency=XXX"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v3
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v3
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
// Framework changed
v4
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
);
v4
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
);
v4
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
);
v4
.search_paths
.add_path
(
"framework=XXX"
,
super
::
ErrorOutputType
::
Json
);
v4
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
);
v4
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v4
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v4
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v4
.search_paths
.add_path
(
"framework=XXX"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v4
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
// All changed
v5
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
);
v5
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
);
v5
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
);
v5
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
);
v5
.search_paths
.add_path
(
"all=XXX"
,
super
::
ErrorOutputType
::
Json
);
v5
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v5
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v5
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v5
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v5
.search_paths
.add_path
(
"all=XXX"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
assert
!
(
v1
.dep_tracking_hash
()
!=
v2
.dep_tracking_hash
());
assert
!
(
v1
.dep_tracking_hash
()
!=
v3
.dep_tracking_hash
());
...
...
@@ -2324,29 +2322,29 @@ fn test_search_paths_tracking_hash_different_order() {
let
mut
v4
=
super
::
basic_options
();
// Reference
v1
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
);
v1
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
);
v1
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
);
v1
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
);
v1
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
);
v2
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
);
v2
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
);
v2
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
);
v2
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
);
v2
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
);
v3
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
);
v3
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
);
v3
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
);
v3
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
);
v3
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
);
v4
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
);
v4
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
);
v4
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
);
v4
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
);
v4
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
);
v1
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v1
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v1
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v1
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v1
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v2
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v2
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v2
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v2
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v2
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v3
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v3
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v3
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v3
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v3
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v4
.search_paths
.add_path
(
"all=mno"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v4
.search_paths
.add_path
(
"native=abc"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v4
.search_paths
.add_path
(
"crate=def"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v4
.search_paths
.add_path
(
"dependency=ghi"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
v4
.search_paths
.add_path
(
"framework=jkl"
,
super
::
ErrorOutputType
::
Json
(
false
)
);
assert
!
(
v1
.dep_tracking_hash
()
==
v2
.dep_tracking_hash
());
assert
!
(
v1
.dep_tracking_hash
()
==
v3
.dep_tracking_hash
());
...
...
src/test/ui/lint/unused_parens_json_suggestion.rs
浏览文件 @
d1d9cfc7
...
...
@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// compile-flags: --error-format pretty-json -Z
pretty_json_error_format
// compile-flags: --error-format pretty-json -Z
unstable-options
// The output for humans should just highlight the whole span without showing
// the suggested replacement, but we also want to test that suggested
...
...
src/test/ui/lint/use_suggestion_json.rs
浏览文件 @
d1d9cfc7
...
...
@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// compile-flags: --error-format pretty-json -Z
pretty_json_error_format
// compile-flags: --error-format pretty-json -Z
unstable-options
// The output for humans should just highlight the whole span without showing
// the suggested replacement, but we also want to test that suggested
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录