Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
f52ef3b8
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,发现更多精彩内容 >>
未验证
提交
f52ef3b8
编写于
8月 01, 2018
作者:
P
Pietro Albini
提交者:
GitHub
8月 01, 2018
浏览文件
操作
浏览文件
下载
差异文件
Rollup merge of #52835 - GuillaumeGomez:ice-rustdoc-links, r=eddyb
Fix Alias intra doc ICE Fixes #52611. cc @QuietMisdreavus r? @varkor
上级
d5fcd27e
d94bdf8c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
56 addition
and
23 deletion
+56
-23
src/librustdoc/clean/mod.rs
src/librustdoc/clean/mod.rs
+25
-21
src/librustdoc/visit_ast.rs
src/librustdoc/visit_ast.rs
+2
-2
src/test/rustdoc-ui/intra-doc-alias-ice.rs
src/test/rustdoc-ui/intra-doc-alias-ice.rs
+16
-0
src/test/rustdoc-ui/intra-doc-alias-ice.stderr
src/test/rustdoc-ui/intra-doc-alias-ice.stderr
+13
-0
未找到文件。
src/librustdoc/clean/mod.rs
浏览文件 @
f52ef3b8
...
...
@@ -1194,7 +1194,8 @@ fn resolve(cx: &DocContext, path_str: &str, is_val: bool) -> Result<(Def, Option
})
?
;
match
ty
.def
{
Def
::
Struct
(
did
)
|
Def
::
Union
(
did
)
|
Def
::
Enum
(
did
)
|
Def
::
TyAlias
(
did
)
=>
{
let
item
=
cx
.tcx
.inherent_impls
(
did
)
.iter
()
let
item
=
cx
.tcx
.inherent_impls
(
did
)
.iter
()
.flat_map
(|
imp
|
cx
.tcx
.associated_items
(
*
imp
))
.find
(|
item
|
item
.ident.name
==
item_name
);
if
let
Some
(
item
)
=
item
{
...
...
@@ -1205,26 +1206,29 @@ fn resolve(cx: &DocContext, path_str: &str, is_val: bool) -> Result<(Def, Option
};
Ok
((
ty
.def
,
Some
(
format!
(
"{}.{}"
,
out
,
item_name
))))
}
else
{
let
is_enum
=
match
ty
.def
{
Def
::
Enum
(
_
)
=>
true
,
_
=>
false
,
};
let
elem
=
if
is_enum
{
cx
.tcx
.adt_def
(
did
)
.all_fields
()
.find
(|
item
|
item
.ident.name
==
item_name
)
}
else
{
cx
.tcx
.adt_def
(
did
)
.non_enum_variant
()
.fields
.iter
()
.find
(|
item
|
item
.ident.name
==
item_name
)
};
if
let
Some
(
item
)
=
elem
{
Ok
((
ty
.def
,
Some
(
format!
(
"{}.{}"
,
if
is_enum
{
"variant"
}
else
{
"structfield"
},
item
.ident
))))
}
else
{
Err
(())
match
cx
.tcx
.type_of
(
did
)
.sty
{
ty
::
TyAdt
(
def
,
_
)
=>
{
if
let
Some
(
item
)
=
if
def
.is_enum
()
{
def
.all_fields
()
.find
(|
item
|
item
.ident.name
==
item_name
)
}
else
{
def
.non_enum_variant
()
.fields
.iter
()
.find
(|
item
|
item
.ident.name
==
item_name
)
}
{
Ok
((
ty
.def
,
Some
(
format!
(
"{}.{}"
,
if
def
.is_enum
()
{
"variant"
}
else
{
"structfield"
},
item
.ident
))))
}
else
{
Err
(())
}
}
_
=>
Err
(()),
}
}
}
...
...
src/librustdoc/visit_ast.rs
浏览文件 @
f52ef3b8
...
...
@@ -105,8 +105,8 @@ pub fn visit(&mut self, krate: &hir::Crate) {
}
pub
fn
visit_variant_data
(
&
mut
self
,
item
:
&
hir
::
Item
,
name
:
ast
::
Name
,
sd
:
&
hir
::
VariantData
,
generics
:
&
hir
::
Generics
)
->
Struct
{
name
:
ast
::
Name
,
sd
:
&
hir
::
VariantData
,
generics
:
&
hir
::
Generics
)
->
Struct
{
debug!
(
"Visiting struct"
);
let
struct_type
=
struct_type_from_def
(
&*
sd
);
Struct
{
...
...
src/test/rustdoc-ui/intra-doc-alias-ice.rs
0 → 100644
浏览文件 @
f52ef3b8
// Copyright 2018 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.
#![deny(intra_doc_link_resolution_failure)]
pub
type
TypeAlias
=
usize
;
/// [broken cross-reference](TypeAlias::hoge) //~ ERROR
pub
fn
some_public_item
()
{}
src/test/rustdoc-ui/intra-doc-alias-ice.stderr
0 → 100644
浏览文件 @
f52ef3b8
error: `[TypeAlias::hoge]` cannot be resolved, ignoring it...
--> $DIR/intra-doc-alias-ice.rs:15:30
|
15 | /// [broken cross-reference](TypeAlias::hoge) //~ ERROR
| ^^^^^^^^^^^^^^^ cannot be resolved, ignoring
|
note: lint level defined here
--> $DIR/intra-doc-alias-ice.rs:11:9
|
11 | #![deny(intra_doc_link_resolution_failure)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= help: to escape `[` and `]` characters, just add '/' before them like `/[` or `/]`
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录