Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
17d284b4
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,发现更多精彩内容 >>
提交
17d284b4
编写于
2月 15, 2016
作者:
B
bors
浏览文件
操作
浏览文件
下载
差异文件
Auto merge of #31530 - dirk:dirk/restrict-matching-of-cfg-opts, r=alexcrichton
Fixes #31497.
上级
7a737d56
2766e254
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
36 addition
and
13 deletion
+36
-13
mk/crates.mk
mk/crates.mk
+3
-3
mk/dist.mk
mk/dist.mk
+1
-1
mk/docs.mk
mk/docs.mk
+4
-4
mk/prepare.mk
mk/prepare.mk
+1
-1
src/error_index_generator/main.rs
src/error_index_generator/main.rs
+0
-0
src/librustc/session/config.rs
src/librustc/session/config.rs
+14
-4
src/test/compile-fail/cfg-arg-invalid.rs
src/test/compile-fail/cfg-arg-invalid.rs
+13
-0
未找到文件。
mk/crates.mk
浏览文件 @
17d284b4
...
...
@@ -59,7 +59,7 @@ RUSTC_CRATES := rustc rustc_typeck rustc_mir rustc_borrowck rustc_resolve rustc_
rustc_data_structures rustc_front rustc_platform_intrinsics
\
rustc_plugin rustc_metadata rustc_passes
HOST_CRATES
:=
syntax syntax_ext
$(RUSTC_CRATES)
rustdoc fmt_macros
TOOLS
:=
compiletest rustdoc rustc rustbook error
-index-
generator
TOOLS
:=
compiletest rustdoc rustc rustbook error
_index_
generator
DEPS_core
:=
DEPS_alloc
:=
core libc alloc_system
...
...
@@ -120,12 +120,12 @@ TOOL_DEPS_compiletest := test getopts
TOOL_DEPS_rustdoc
:=
rustdoc
TOOL_DEPS_rustc
:=
rustc_driver
TOOL_DEPS_rustbook
:=
std rustdoc
TOOL_DEPS_error
-index-
generator
:=
rustdoc syntax serialize
TOOL_DEPS_error
_index_
generator
:=
rustdoc syntax serialize
TOOL_SOURCE_compiletest
:=
$(S)
src/compiletest/compiletest.rs
TOOL_SOURCE_rustdoc
:=
$(S)
src/driver/driver.rs
TOOL_SOURCE_rustc
:=
$(S)
src/driver/driver.rs
TOOL_SOURCE_rustbook
:=
$(S)
src/rustbook/main.rs
TOOL_SOURCE_error
-index-generator
:=
$(S)
src/error-index-
generator/main.rs
TOOL_SOURCE_error
_index_generator
:=
$(S)
src/error_index_
generator/main.rs
ONLY_RLIB_core
:=
1
ONLY_RLIB_libc
:=
1
...
...
mk/dist.mk
浏览文件 @
17d284b4
...
...
@@ -52,7 +52,7 @@ PKG_FILES := \
doc
\
driver
\
etc
\
error
-index-
generator
\
error
_index_
generator
\
$(
foreach
crate,
$(CRATES)
,lib
$(crate)
)
\
libcollectionstest
\
libcoretest
\
...
...
mk/docs.mk
浏览文件 @
17d284b4
...
...
@@ -59,8 +59,8 @@ RUSTBOOK_EXE = $(HBIN2_H_$(CFG_BUILD))/rustbook$(X_$(CFG_BUILD))
# ./configure
RUSTBOOK
=
$
(
RPATH_VAR2_T_
$(CFG_BUILD)
_H_
$(CFG_BUILD)
)
$(RUSTBOOK_EXE)
# The error
-index-
generator executable...
ERR_IDX_GEN_EXE
=
$
(
HBIN2_H_
$(CFG_BUILD)
)
/error
-index-
generator
$
(
X_
$(CFG_BUILD)
)
# The error
_index_
generator executable...
ERR_IDX_GEN_EXE
=
$
(
HBIN2_H_
$(CFG_BUILD)
)
/error
_index_
generator
$
(
X_
$(CFG_BUILD)
)
ERR_IDX_GEN
=
$
(
RPATH_VAR2_T_
$(CFG_BUILD)
_H_
$(CFG_BUILD)
)
$(ERR_IDX_GEN_EXE)
ERR_IDX_GEN_MD
=
$
(
RPATH_VAR2_T_
$(CFG_BUILD)
_H_
$(CFG_BUILD)
)
$(ERR_IDX_GEN_EXE)
markdown
...
...
@@ -221,9 +221,9 @@ error-index: doc/error-index.html
# Metadata used to generate the index is created as a side effect of
# the build so this depends on every crate being up to date.
doc/error-index.html
:
$(ERR_IDX_GEN_EXE) $(CSREQ$(2)_T_$(CFG_BUILD)_H_$(CFG_BUILD)) | doc/
$(Q)
$(
call
E, error
-index-
generator:
$@
)
$(Q)
$(
call
E, error
_index_
generator:
$@
)
$(Q)$(ERR_IDX_GEN)
doc/error-index.md
:
$(ERR_IDX_GEN_EXE) $(CSREQ$(2)_T_$(CFG_BUILD)_H_$(CFG_BUILD)) | doc/
$(Q)
$(
call
E, error
-index-
generator:
$@
)
$(Q)
$(
call
E, error
_index_
generator:
$@
)
$(Q)$(ERR_IDX_GEN_MD)
mk/prepare.mk
浏览文件 @
17d284b4
...
...
@@ -82,7 +82,7 @@ define PREPARE_MAN
endef
PREPARE_TOOLS
=
$(
filter-out
compiletest rustbook error
-index-
generator,
$(TOOLS)
)
PREPARE_TOOLS
=
$(
filter-out
compiletest rustbook error
_index_
generator,
$(TOOLS)
)
# $(1) is tool
...
...
src/error
-index-
generator/main.rs
→
src/error
_index_
generator/main.rs
浏览文件 @
17d284b4
文件已移动
src/librustc/session/config.rs
浏览文件 @
17d284b4
...
...
@@ -28,6 +28,7 @@
use
syntax
::
attr
::
AttrMetaMethods
;
use
syntax
::
errors
::{
ColorConfig
,
Handler
};
use
syntax
::
parse
;
use
syntax
::
parse
::
lexer
::
Reader
;
use
syntax
::
parse
::
token
::
InternedString
;
use
syntax
::
feature_gate
::
UnstableFeatures
;
...
...
@@ -906,10 +907,19 @@ pub fn rustc_optgroups() -> Vec<RustcOptGroup> {
// Convert strings provided as --cfg [cfgspec] into a crate_cfg
pub
fn
parse_cfgspecs
(
cfgspecs
:
Vec
<
String
>
)
->
ast
::
CrateConfig
{
cfgspecs
.into_iter
()
.map
(|
s
|
{
parse
::
parse_meta_from_source_str
(
"cfgspec"
.to_string
(),
s
.to_string
(),
Vec
::
new
(),
&
parse
::
ParseSess
::
new
())
let
sess
=
parse
::
ParseSess
::
new
();
let
mut
parser
=
parse
::
new_parser_from_source_str
(
&
sess
,
Vec
::
new
(),
"cfgspec"
.to_string
(),
s
.to_string
());
let
meta_item
=
panictry!
(
parser
.parse_meta_item
());
if
!
parser
.reader
.is_eof
()
{
early_error
(
ErrorOutputType
::
default
(),
&
format!
(
"invalid --cfg argument: {}"
,
s
))
}
meta_item
})
.collect
::
<
ast
::
CrateConfig
>
()
}
...
...
src/test/compile-fail/cfg-arg-invalid.rs
0 → 100644
浏览文件 @
17d284b4
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// compile-flags: --cfg a{b}
// error-pattern: invalid --cfg argument: a{b}
fn
main
()
{}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录