Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
cdcbdfdf
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,发现更多精彩内容 >>
提交
cdcbdfdf
编写于
9月 12, 2018
作者:
N
Nick Cameron
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix tests and rustdoc
上级
c4803863
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
28 addition
and
24 deletion
+28
-24
src/librustdoc/clean/mod.rs
src/librustdoc/clean/mod.rs
+2
-0
src/librustdoc/core.rs
src/librustdoc/core.rs
+2
-0
src/test/mir-opt/end_region_5.rs
src/test/mir-opt/end_region_5.rs
+3
-3
src/test/mir-opt/end_region_6.rs
src/test/mir-opt/end_region_6.rs
+3
-3
src/test/mir-opt/end_region_7.rs
src/test/mir-opt/end_region_7.rs
+3
-3
src/test/mir-opt/end_region_8.rs
src/test/mir-opt/end_region_8.rs
+3
-3
src/test/mir-opt/inline-closure-borrows-arg.rs
src/test/mir-opt/inline-closure-borrows-arg.rs
+1
-1
src/test/mir-opt/inline-closure.rs
src/test/mir-opt/inline-closure.rs
+1
-1
src/test/mir-opt/validate_1.rs
src/test/mir-opt/validate_1.rs
+2
-2
src/test/mir-opt/validate_4.rs
src/test/mir-opt/validate_4.rs
+6
-6
src/test/mir-opt/validate_5.rs
src/test/mir-opt/validate_5.rs
+2
-2
未找到文件。
src/librustdoc/clean/mod.rs
浏览文件 @
cdcbdfdf
...
...
@@ -4012,6 +4012,8 @@ fn push(&mut self, text: &str) {
def
:
def_ctor
(
def_id
),
segments
:
hir
::
HirVec
::
from_vec
(
apb
.names
.iter
()
.map
(|
s
|
hir
::
PathSegment
{
ident
:
ast
::
Ident
::
from_str
(
&
s
),
id
:
None
,
def
:
None
,
args
:
None
,
infer_types
:
false
,
})
.collect
())
...
...
src/librustdoc/core.rs
浏览文件 @
cdcbdfdf
...
...
@@ -186,6 +186,8 @@ pub fn get_real_ty<F>(&self,
segments
.push
(
hir
::
PathSegment
::
new
(
real_name
.unwrap_or
(
last
.ident
),
None
,
None
,
self
.generics_to_path_params
(
generics
.clone
()),
false
,
));
...
...
src/test/mir-opt/end_region_5.rs
浏览文件 @
cdcbdfdf
...
...
@@ -33,7 +33,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
// let _1: D;
// ...
// let mut _2: ();
// let mut _3: [closure@NodeId(
1
8) d:&'14s D];
// let mut _3: [closure@NodeId(
2
8) d:&'14s D];
// let mut _4: &'14s D;
// bb0: {
// StorageLive(_1);
...
...
@@ -42,7 +42,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
// StorageLive(_3);
// StorageLive(_4);
// _4 = &'14s _1;
// _3 = [closure@NodeId(
1
8)] { d: move _4 };
// _3 = [closure@NodeId(
2
8)] { d: move _4 };
// StorageDead(_4);
// _2 = const foo(move _3) -> [return: bb2, unwind: bb3];
// }
...
...
@@ -67,7 +67,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
// END rustc.main.SimplifyCfg-qualify-consts.after.mir
// START rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir
// fn main::{{closure}}(_1: [closure@NodeId(
1
8) d:&'14s D]) -> i32 {
// fn main::{{closure}}(_1: [closure@NodeId(
2
8) d:&'14s D]) -> i32 {
// let mut _0: i32;
//
// bb0: {
...
...
src/test/mir-opt/end_region_6.rs
浏览文件 @
cdcbdfdf
...
...
@@ -33,7 +33,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
// let _1: D;
// ...
// let mut _2: ();
// let mut _3: [closure@NodeId(
22
) d:&'19s D];
// let mut _3: [closure@NodeId(
33
) d:&'19s D];
// let mut _4: &'19s D;
// bb0: {
// StorageLive(_1);
...
...
@@ -42,7 +42,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
// StorageLive(_3);
// StorageLive(_4);
// _4 = &'19s _1;
// _3 = [closure@NodeId(
22
)] { d: move _4 };
// _3 = [closure@NodeId(
33
)] { d: move _4 };
// StorageDead(_4);
// _2 = const foo(move _3) -> [return: bb2, unwind: bb3];
// }
...
...
@@ -66,7 +66,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
// END rustc.main.SimplifyCfg-qualify-consts.after.mir
// START rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir
// fn main::{{closure}}(_1: [closure@NodeId(
22
) d:&'19s D]) -> i32 {
// fn main::{{closure}}(_1: [closure@NodeId(
33
) d:&'19s D]) -> i32 {
// let mut _0: i32;
// ...
// let _2: &'16_0rs D;
...
...
src/test/mir-opt/end_region_7.rs
浏览文件 @
cdcbdfdf
...
...
@@ -33,13 +33,13 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
// let _1: D;
// ...
// let mut _2: ();
// let mut _3: [closure@NodeId(
22
) d:D];
// let mut _3: [closure@NodeId(
33
) d:D];
// bb0: {
// StorageLive(_1);
// _1 = D::{{constructor}}(const 0i32,);
// FakeRead(ForLet, _1);
// StorageLive(_3);
// _3 = [closure@NodeId(
22
)] { d: move _1 };
// _3 = [closure@NodeId(
33
)] { d: move _1 };
// _2 = const foo(move _3) -> [return: bb2, unwind: bb4];
// }
// bb1: {
...
...
@@ -67,7 +67,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
// END rustc.main.SimplifyCfg-qualify-consts.after.mir
// START rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir
// fn main::{{closure}}(_1: [closure@NodeId(
22
) d:D]) -> i32 {
// fn main::{{closure}}(_1: [closure@NodeId(
33
) d:D]) -> i32 {
// let mut _0: i32;
// ...
// let _2: &'16_0rs D;
...
...
src/test/mir-opt/end_region_8.rs
浏览文件 @
cdcbdfdf
...
...
@@ -36,7 +36,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
// let _1: D;
// ...
// let mut _3: ();
// let mut _4: [closure@NodeId(
22
) r:&'19s D];
// let mut _4: [closure@NodeId(
33
) r:&'19s D];
// bb0: {
// StorageLive(_1);
// _1 = D::{{constructor}}(const 0i32,);
...
...
@@ -45,7 +45,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
// _2 = &'21_1rs _1;
// FakeRead(ForLet, _2);
// StorageLive(_4);
// _4 = [closure@NodeId(
22
)] { r: _2 };
// _4 = [closure@NodeId(
33
)] { r: _2 };
// _3 = const foo(move _4) -> [return: bb2, unwind: bb3];
// }
// bb1: {
...
...
@@ -72,7 +72,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
// END rustc.main.SimplifyCfg-qualify-consts.after.mir
// START rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir
// fn main::{{closure}}(_1: [closure@NodeId(
22
) r:&'19s D]) -> i32 {
// fn main::{{closure}}(_1: [closure@NodeId(
33
) r:&'19s D]) -> i32 {
// let mut _0: i32;
//
// bb0: {
...
...
src/test/mir-opt/inline-closure-borrows-arg.rs
浏览文件 @
cdcbdfdf
...
...
@@ -30,7 +30,7 @@ fn foo<T: Copy>(_t: T, q: &i32) -> i32 {
// ...
// bb0: {
// ...
// _3 = [closure@NodeId(
39
)];
// _3 = [closure@NodeId(
53
)];
// ...
// _4 = &_3;
// ...
...
...
src/test/mir-opt/inline-closure.rs
浏览文件 @
cdcbdfdf
...
...
@@ -26,7 +26,7 @@ fn foo<T: Copy>(_t: T, q: i32) -> i32 {
// ...
// bb0: {
// ...
// _3 = [closure@NodeId(
28
)];
// _3 = [closure@NodeId(
39
)];
// ...
// _4 = &_3;
// ...
...
...
src/test/mir-opt/validate_1.rs
浏览文件 @
cdcbdfdf
...
...
@@ -59,10 +59,10 @@ fn main() {
// }
// END rustc.main.EraseRegions.after.mir
// START rustc.main-{{closure}}.EraseRegions.after.mir
// fn main::{{closure}}(_1: &ReErased [closure@NodeId(
50
)], _2: &ReErased mut i32) -> i32 {
// fn main::{{closure}}(_1: &ReErased [closure@NodeId(
65
)], _2: &ReErased mut i32) -> i32 {
// ...
// bb0: {
// Validate(Acquire, [_1: &ReFree(DefId(0/1:11 ~ validate_1[317d]::main[0]::{{closure}}[0]), BrEnv) [closure@NodeId(
50
)], _2: &ReFree(DefId(0/1:11 ~ validate_1[317d]::main[0]::{{closure}}[0]), BrAnon(0)) mut i32]);
// Validate(Acquire, [_1: &ReFree(DefId(0/1:11 ~ validate_1[317d]::main[0]::{{closure}}[0]), BrEnv) [closure@NodeId(
65
)], _2: &ReFree(DefId(0/1:11 ~ validate_1[317d]::main[0]::{{closure}}[0]), BrAnon(0)) mut i32]);
// StorageLive(_3);
// Validate(Suspend(ReScope(Remainder { block: ItemLocalId(25), first_statement_index: 0 })), [(*_2): i32]);
// _3 = &ReErased (*_2);
...
...
src/test/mir-opt/validate_4.rs
浏览文件 @
cdcbdfdf
...
...
@@ -48,11 +48,11 @@ fn main() {
// }
// END rustc.write_42.EraseRegions.after.mir
// START rustc.write_42-{{closure}}.EraseRegions.after.mir
// fn write_42::{{closure}}(_1: &ReErased [closure@NodeId(
2
2)], _2: *mut i32) -> () {
// fn write_42::{{closure}}(_1: &ReErased [closure@NodeId(
3
2)], _2: *mut i32) -> () {
// ...
// bb0: {
// Validate(Acquire, [_1: &ReFree(DefId(0/1:9 ~ validate_4[317d]::write_42[0]::{{closure}}[0]), BrEnv) [closure@NodeId(
2
2)], _2: *mut i32]);
// Validate(Release, [_1: &ReFree(DefId(0/1:9 ~ validate_4[317d]::write_42[0]::{{closure}}[0]), BrEnv) [closure@NodeId(
2
2)], _2: *mut i32]);
// Validate(Acquire, [_1: &ReFree(DefId(0/1:9 ~ validate_4[317d]::write_42[0]::{{closure}}[0]), BrEnv) [closure@NodeId(
3
2)], _2: *mut i32]);
// Validate(Release, [_1: &ReFree(DefId(0/1:9 ~ validate_4[317d]::write_42[0]::{{closure}}[0]), BrEnv) [closure@NodeId(
3
2)], _2: *mut i32]);
// (*_2) = const 23i32;
// _0 = ();
// return;
...
...
@@ -76,11 +76,11 @@ fn main() {
// }
// END rustc.test.EraseRegions.after.mir
// START rustc.main-{{closure}}.EraseRegions.after.mir
// fn main::{{closure}}(_1: &ReErased [closure@NodeId(
6
0)], _2: &ReErased mut i32) -> bool {
// fn main::{{closure}}(_1: &ReErased [closure@NodeId(
8
0)], _2: &ReErased mut i32) -> bool {
// ...
// bb0: {
// Validate(Acquire, [_1: &ReFree(DefId(0/1:10 ~ validate_4[317d]::main[0]::{{closure}}[0]), BrEnv) [closure@NodeId(
6
0)], _2: &ReFree(DefId(0/1:10 ~ validate_4[317d]::main[0]::{{closure}}[0]), BrAnon(0)) mut i32]);
// Validate(Release, [_1: &ReFree(DefId(0/1:10 ~ validate_4[317d]::main[0]::{{closure}}[0]), BrEnv) [closure@NodeId(
6
0)], _2: &ReFree(DefId(0/1:10 ~ validate_4[317d]::main[0]::{{closure}}[0]), BrAnon(0)) mut i32]);
// Validate(Acquire, [_1: &ReFree(DefId(0/1:10 ~ validate_4[317d]::main[0]::{{closure}}[0]), BrEnv) [closure@NodeId(
8
0)], _2: &ReFree(DefId(0/1:10 ~ validate_4[317d]::main[0]::{{closure}}[0]), BrAnon(0)) mut i32]);
// Validate(Release, [_1: &ReFree(DefId(0/1:10 ~ validate_4[317d]::main[0]::{{closure}}[0]), BrEnv) [closure@NodeId(
8
0)], _2: &ReFree(DefId(0/1:10 ~ validate_4[317d]::main[0]::{{closure}}[0]), BrAnon(0)) mut i32]);
// StorageLive(_3);
// ...
// _0 = const write_42(move _3) -> bb1;
...
...
src/test/mir-opt/validate_5.rs
浏览文件 @
cdcbdfdf
...
...
@@ -46,10 +46,10 @@ fn main() {
// }
// END rustc.test.EraseRegions.after.mir
// START rustc.main-{{closure}}.EraseRegions.after.mir
// fn main::{{closure}}(_1: &ReErased [closure@NodeId(
46
)], _2: &ReErased mut i32) -> bool {
// fn main::{{closure}}(_1: &ReErased [closure@NodeId(
62
)], _2: &ReErased mut i32) -> bool {
// ...
// bb0: {
// Validate(Acquire, [_1: &ReFree(DefId(0/1:9 ~ validate_5[317d]::main[0]::{{closure}}[0]), BrEnv) [closure@NodeId(
46
)], _2: &ReFree(DefId(0/1:9 ~ validate_5[317d]::main[0]::{{closure}}[0]), BrAnon(0)) mut i32]);
// Validate(Acquire, [_1: &ReFree(DefId(0/1:9 ~ validate_5[317d]::main[0]::{{closure}}[0]), BrEnv) [closure@NodeId(
62
)], _2: &ReFree(DefId(0/1:9 ~ validate_5[317d]::main[0]::{{closure}}[0]), BrAnon(0)) mut i32]);
// StorageLive(_3);
// StorageLive(_4);
// StorageLive(_5);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录