Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
f210deae
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,发现更多精彩内容 >>
提交
f210deae
编写于
7月 09, 2012
作者:
G
Graydon Hoare
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'incoming' of github.com:/mozilla/rust into incoming
Conflicts: src/snapshots.txt
上级
c26d0255
f72487d1
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
36 addition
and
7 deletion
+36
-7
src/rustc/front/config.rs
src/rustc/front/config.rs
+24
-6
src/test/run-pass/class-impl-parameterized-iface.rs
src/test/run-pass/class-impl-parameterized-iface.rs
+1
-0
src/test/run-pass/class-impl-very-parameterized-iface.rs
src/test/run-pass/class-impl-very-parameterized-iface.rs
+1
-0
src/test/run-pass/class-poly-methods-cross-crate.rs
src/test/run-pass/class-poly-methods-cross-crate.rs
+0
-1
src/test/run-pass/conditional-compile.rs
src/test/run-pass/conditional-compile.rs
+10
-0
未找到文件。
src/rustc/front/config.rs
浏览文件 @
f210deae
...
...
@@ -39,11 +39,22 @@ fn filter_item(cx: ctxt, &&item: @ast::item) ->
if
item_in_cfg
(
cx
,
item
)
{
option
::
some
(
item
)
}
else
{
option
::
none
}
}
fn
filter_view_item
(
cx
:
ctxt
,
&&
view_item
:
@
ast
::
view_item
)
->
option
<@
ast
::
view_item
>
{
if
view_item_in_cfg
(
cx
,
view_item
)
{
option
::
some
(
view_item
)
}
else
{
option
::
none
}
}
fn
fold_mod
(
cx
:
ctxt
,
m
:
ast
::
_
mod
,
fld
:
fold
::
ast_fold
)
->
ast
::
_
mod
{
let
filter
=
|
a
|
filter_item
(
cx
,
a
);
let
filtered_items
=
vec
::
filter_map
(
m
.items
,
filter
);
ret
{
view_items
:
vec
::
map
(
m
.view_items
,
fld
.fold_view_item
),
let
item_filter
=
|
a
|
filter_item
(
cx
,
a
);
let
filtered_items
=
vec
::
filter_map
(
m
.items
,
item_filter
);
let
view_item_filter
=
|
a
|
filter_view_item
(
cx
,
a
);
let
filtered_view_items
=
vec
::
filter_map
(
m
.view_items
,
view_item_filter
);
ret
{
view_items
:
vec
::
map
(
filtered_view_items
,
fld
.fold_view_item
),
items
:
vec
::
map
(
filtered_items
,
fld
.fold_item
)};
}
...
...
@@ -56,9 +67,12 @@ fn filter_foreign_item(cx: ctxt, &&item: @ast::foreign_item) ->
fn
fold_foreign_mod
(
cx
:
ctxt
,
nm
:
ast
::
foreign_mod
,
fld
:
fold
::
ast_fold
)
->
ast
::
foreign_mod
{
let
filter
=
|
a
|
filter_foreign_item
(
cx
,
a
);
let
filtered_items
=
vec
::
filter_map
(
nm
.items
,
filter
);
ret
{
view_items
:
vec
::
map
(
nm
.view_items
,
fld
.fold_view_item
),
let
item_filter
=
|
a
|
filter_foreign_item
(
cx
,
a
);
let
filtered_items
=
vec
::
filter_map
(
nm
.items
,
item_filter
);
let
view_item_filter
=
|
a
|
filter_view_item
(
cx
,
a
);
let
filtered_view_items
=
vec
::
filter_map
(
nm
.view_items
,
view_item_filter
);
ret
{
view_items
:
vec
::
map
(
filtered_view_items
,
fld
.fold_view_item
),
items
:
filtered_items
};
}
...
...
@@ -98,6 +112,10 @@ fn foreign_item_in_cfg(cx: ctxt, item: @ast::foreign_item) -> bool {
ret
cx
.in_cfg
(
item
.attrs
);
}
fn
view_item_in_cfg
(
cx
:
ctxt
,
item
:
@
ast
::
view_item
)
->
bool
{
ret
cx
.in_cfg
(
item
.attrs
);
}
// Determine if an item should be translated in the current crate
// configuration based on the item's attributes
fn
in_cfg
(
cfg
:
ast
::
crate_cfg
,
attrs
:
~
[
ast
::
attribute
])
->
bool
{
...
...
src/test/run-pass/class-impl-parameterized-iface.rs
浏览文件 @
f210deae
...
...
@@ -60,6 +60,7 @@ fn each_key(&&f: fn(&&int) -> bool) {
fn
each_value
(
&&
f
:
fn
(
&&
bool
)
->
bool
)
{
for
self
.each
|
_
k
,
v
|
{
if
!
f
(
v
)
{
break
;
}
again
;};
}
fn
clear
()
{
}
}
fn
main
()
{
...
...
src/test/run-pass/class-impl-very-parameterized-iface.rs
浏览文件 @
f210deae
...
...
@@ -82,6 +82,7 @@ fn each_key(&&f: fn(&&int) -> bool) {
fn
each_value
(
&&
f
:
fn
(
&&
T
)
->
bool
)
{
for
self
.each
|
_
k
,
v
|
{
if
!
f
(
v
)
{
break
;
}
again
;};
}
fn
clear
()
{
}
}
...
...
src/test/run-pass/class-poly-methods-cross-crate.rs
浏览文件 @
f210deae
// xfail-fast
// aux-build:cci_class_6.rs
use
cci_class_6
;
import
cci_class_6
::
kitties
::
*
;
...
...
src/test/run-pass/conditional-compile.rs
浏览文件 @
f210deae
...
...
@@ -87,3 +87,13 @@ mod test_foreign_items {
fn
vec_from_buf_shared
();
}
}
mod
test_use_statements
{
#[cfg(bogus)]
use
flippity_foo
;
extern
mod
rustrt
{
#[cfg(bogus)]
use
flippity_foo
;
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录