Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
88f26436
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,发现更多精彩内容 >>
提交
88f26436
编写于
7月 12, 2018
作者:
G
Guillaume Gomez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add "self" intra-link support
上级
6cc42a44
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
102 addition
and
4 deletion
+102
-4
src/librustdoc/clean/mod.rs
src/librustdoc/clean/mod.rs
+59
-2
src/librustdoc/core.rs
src/librustdoc/core.rs
+4
-2
src/test/rustdoc/intra-link-self.rs
src/test/rustdoc/intra-link-self.rs
+39
-0
未找到文件。
src/librustdoc/clean/mod.rs
浏览文件 @
88f26436
...
...
@@ -20,7 +20,7 @@
use
rustc_target
::
spec
::
abi
::
Abi
;
use
syntax
;
use
syntax
::
ast
::{
self
,
AttrStyle
,
NodeId
,
Ident
};
use
syntax
::
ast
::{
self
,
AttrStyle
,
N
ame
,
N
odeId
,
Ident
};
use
syntax
::
attr
;
use
syntax
::
codemap
::{
dummy_spanned
,
Spanned
};
use
syntax
::
feature_gate
::
UnstableFeatures
;
...
...
@@ -39,6 +39,7 @@
use
rustc
::
hir
::
def
::{
self
,
Def
,
CtorKind
};
use
rustc
::
hir
::
def_id
::{
CrateNum
,
DefId
,
DefIndex
,
CRATE_DEF_INDEX
,
LOCAL_CRATE
};
use
rustc
::
hir
::
def_id
::
DefIndexAddressSpace
;
use
rustc
::
hir
::
map
::
Node
;
use
rustc
::
ty
::
subst
::
Substs
;
use
rustc
::
ty
::{
self
,
TyCtxt
,
Region
,
RegionVid
,
Ty
,
AdtKind
};
use
rustc
::
middle
::
stability
;
...
...
@@ -576,10 +577,23 @@ fn clean(&self, cx: &DocContext) -> Item {
.next
()
.map_or
(
true
,
|
a
|
a
.style
==
AttrStyle
::
Inner
)
{
// inner doc comment, use the module's own scope for resolution
if
self
.id
!=
NodeId
::
new
(
0
)
{
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
cx
.tcx.hir
.name
(
self
.id
));
}
else
{
*
cx
.current_item_name
.borrow_mut
()
=
None
;
}
cx
.mod_ids
.borrow_mut
()
.push
(
self
.id
);
self
.attrs
.clean
(
cx
)
}
else
{
// outer doc comment, use its parent's scope
match
cx
.mod_ids
.borrow
()
.last
()
{
Some
(
parent
)
if
*
parent
!=
NodeId
::
new
(
0
)
=>
{
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
cx
.tcx.hir
.name
(
*
parent
));
}
_
=>
{
*
cx
.current_item_name
.borrow_mut
()
=
None
;
}
}
let
attrs
=
self
.attrs
.clean
(
cx
);
cx
.mod_ids
.borrow_mut
()
.push
(
self
.id
);
attrs
...
...
@@ -1132,11 +1146,17 @@ fn resolve(cx: &DocContext, path_str: &str, is_val: bool) -> Result<(Def, Option
};
let
mut
path
=
if
let
Some
(
second
)
=
split
.next
()
{
second
second
.to_owned
()
}
else
{
return
Err
(())
};
if
path
==
"self"
||
path
==
"Self"
{
if
let
Some
(
name
)
=
*
cx
.current_item_name
.borrow
()
{
path
=
name
.to_string
();
}
}
let
ty
=
cx
.resolver
.borrow_mut
()
.with_scope
(
*
id
,
|
resolver
|
{
...
...
@@ -2110,6 +2130,8 @@ fn clean(&self, cx: &DocContext) -> Item {
let
(
generics
,
decl
)
=
enter_impl_trait
(
cx
,
||
{
(
self
.generics
.clean
(
cx
),
(
&
self
.decl
,
self
.body
)
.clean
(
cx
))
});
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
self
.name
);
Item
{
name
:
Some
(
self
.name
.clean
(
cx
)),
attrs
:
self
.attrs
.clean
(
cx
),
...
...
@@ -2288,6 +2310,7 @@ pub struct Trait {
impl
Clean
<
Item
>
for
doctree
::
Trait
{
fn
clean
(
&
self
,
cx
:
&
DocContext
)
->
Item
{
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
self
.name
);
let
attrs
=
self
.attrs
.clean
(
cx
);
let
is_spotlight
=
attrs
.has_doc_flag
(
"spotlight"
);
Item
{
...
...
@@ -2359,6 +2382,7 @@ fn clean(&self, cx: &DocContext) -> Item {
AssociatedTypeItem
(
bounds
.clean
(
cx
),
default
.clean
(
cx
))
}
};
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
self
.ident.name
);
Item
{
name
:
Some
(
self
.ident.name
.clean
(
cx
)),
attrs
:
self
.attrs
.clean
(
cx
),
...
...
@@ -2387,6 +2411,7 @@ fn clean(&self, cx: &DocContext) -> Item {
generics
:
Generics
::
default
(),
},
true
),
};
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
self
.ident.name
);
Item
{
name
:
Some
(
self
.ident.name
.clean
(
cx
)),
source
:
self
.span
.clean
(
cx
),
...
...
@@ -3179,6 +3204,7 @@ fn clean(&self, cx: &DocContext) -> Type {
impl
Clean
<
Item
>
for
hir
::
StructField
{
fn
clean
(
&
self
,
cx
:
&
DocContext
)
->
Item
{
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
self
.ident.name
);
Item
{
name
:
Some
(
self
.ident.name
)
.clean
(
cx
),
attrs
:
self
.attrs
.clean
(
cx
),
...
...
@@ -3257,6 +3283,7 @@ fn clean(&self, cx: &DocContext) -> Vec<Item> {
let
name
=
self
.name
.clean
(
cx
);
let
mut
ret
=
get_auto_traits_with_node_id
(
cx
,
self
.id
,
name
.clone
());
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
self
.name
);
ret
.push
(
Item
{
name
:
Some
(
name
),
attrs
:
self
.attrs
.clean
(
cx
),
...
...
@@ -3282,6 +3309,7 @@ fn clean(&self, cx: &DocContext) -> Vec<Item> {
let
name
=
self
.name
.clean
(
cx
);
let
mut
ret
=
get_auto_traits_with_node_id
(
cx
,
self
.id
,
name
.clone
());
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
self
.name
);
ret
.push
(
Item
{
name
:
Some
(
name
),
attrs
:
self
.attrs
.clean
(
cx
),
...
...
@@ -3334,6 +3362,7 @@ fn clean(&self, cx: &DocContext) -> Vec<Item> {
let
name
=
self
.name
.clean
(
cx
);
let
mut
ret
=
get_auto_traits_with_node_id
(
cx
,
self
.id
,
name
.clone
());
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
self
.name
);
ret
.push
(
Item
{
name
:
Some
(
name
),
attrs
:
self
.attrs
.clean
(
cx
),
...
...
@@ -3360,6 +3389,7 @@ pub struct Variant {
impl
Clean
<
Item
>
for
doctree
::
Variant
{
fn
clean
(
&
self
,
cx
:
&
DocContext
)
->
Item
{
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
self
.name
);
Item
{
name
:
Some
(
self
.name
.clean
(
cx
)),
attrs
:
self
.attrs
.clean
(
cx
),
...
...
@@ -3655,6 +3685,7 @@ pub struct Typedef {
impl
Clean
<
Item
>
for
doctree
::
Typedef
{
fn
clean
(
&
self
,
cx
:
&
DocContext
)
->
Item
{
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
self
.name
);
Item
{
name
:
Some
(
self
.name
.clean
(
cx
)),
attrs
:
self
.attrs
.clean
(
cx
),
...
...
@@ -3706,6 +3737,7 @@ pub struct Static {
impl
Clean
<
Item
>
for
doctree
::
Static
{
fn
clean
(
&
self
,
cx
:
&
DocContext
)
->
Item
{
debug!
(
"cleaning static {}: {:?}"
,
self
.name
.clean
(
cx
),
self
);
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
self
.name
);
Item
{
name
:
Some
(
self
.name
.clean
(
cx
)),
attrs
:
self
.attrs
.clean
(
cx
),
...
...
@@ -3731,6 +3763,7 @@ pub struct Constant {
impl
Clean
<
Item
>
for
doctree
::
Constant
{
fn
clean
(
&
self
,
cx
:
&
DocContext
)
->
Item
{
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
self
.name
);
Item
{
name
:
Some
(
self
.name
.clean
(
cx
)),
attrs
:
self
.attrs
.clean
(
cx
),
...
...
@@ -3800,6 +3833,23 @@ pub fn get_auto_traits_with_def_id(cx: &DocContext, id: DefId) -> Vec<Item> {
finder
.get_with_def_id
(
id
)
}
fn
get_name_if_possible
(
cx
:
&
DocContext
,
node
:
NodeId
)
->
Option
<
Name
>
{
match
cx
.tcx.hir
.get
(
node
)
{
Node
::
NodeItem
(
_
)
|
Node
::
NodeForeignItem
(
_
)
|
Node
::
NodeImplItem
(
_
)
|
Node
::
NodeTraitItem
(
_
)
|
Node
::
NodeVariant
(
_
)
|
Node
::
NodeField
(
_
)
|
Node
::
NodeLifetime
(
_
)
|
Node
::
NodeGenericParam
(
_
)
|
Node
::
NodeBinding
(
&
hir
::
Pat
{
node
:
hir
::
PatKind
::
Binding
(
_
,
_
,
_
,
_
),
..
})
|
Node
::
NodeStructCtor
(
_
)
=>
{}
_
=>
return
None
,
}
Some
(
cx
.tcx.hir
.name
(
node
))
}
impl
Clean
<
Vec
<
Item
>>
for
doctree
::
Impl
{
fn
clean
(
&
self
,
cx
:
&
DocContext
)
->
Vec
<
Item
>
{
let
mut
ret
=
Vec
::
new
();
...
...
@@ -3819,6 +3869,7 @@ fn clean(&self, cx: &DocContext) -> Vec<Item> {
.collect
()
})
.unwrap_or
(
FxHashSet
());
*
cx
.current_item_name
.borrow_mut
()
=
get_name_if_possible
(
cx
,
self
.for_.id
);
ret
.push
(
Item
{
name
:
None
,
attrs
:
self
.attrs
.clean
(
cx
),
...
...
@@ -3905,6 +3956,7 @@ fn build_deref_target_impls(cx: &DocContext,
impl
Clean
<
Item
>
for
doctree
::
ExternCrate
{
fn
clean
(
&
self
,
cx
:
&
DocContext
)
->
Item
{
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
self
.name
);
Item
{
name
:
None
,
attrs
:
self
.attrs
.clean
(
cx
),
...
...
@@ -3951,6 +4003,8 @@ fn clean(&self, cx: &DocContext) -> Vec<Item> {
}
Import
::
Simple
(
name
.clean
(
cx
),
resolve_use_source
(
cx
,
path
))
};
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
self
.name
);
vec!
[
Item
{
name
:
None
,
attrs
:
self
.attrs
.clean
(
cx
),
...
...
@@ -4019,6 +4073,8 @@ fn clean(&self, cx: &DocContext) -> Item {
ForeignTypeItem
}
};
*
cx
.current_item_name
.borrow_mut
()
=
Some
(
self
.name
);
Item
{
name
:
Some
(
self
.name
.clean
(
cx
)),
attrs
:
self
.attrs
.clean
(
cx
),
...
...
@@ -4194,6 +4250,7 @@ pub struct Macro {
impl
Clean
<
Item
>
for
doctree
::
Macro
{
fn
clean
(
&
self
,
cx
:
&
DocContext
)
->
Item
{
let
name
=
self
.name
.clean
(
cx
);
*
cx
.current_item_name
.borrow_mut
()
=
None
;
Item
{
name
:
Some
(
name
.clone
()),
attrs
:
self
.attrs
.clean
(
cx
),
...
...
src/librustdoc/core.rs
浏览文件 @
88f26436
...
...
@@ -25,7 +25,7 @@
use
rustc_metadata
::
cstore
::
CStore
;
use
rustc_target
::
spec
::
TargetTriple
;
use
syntax
::
ast
::
NodeId
;
use
syntax
::
ast
::
{
Name
,
NodeId
}
;
use
syntax
::
codemap
;
use
syntax
::
edition
::
Edition
;
use
syntax
::
feature_gate
::
UnstableFeatures
;
...
...
@@ -82,7 +82,8 @@ pub struct DocContext<'a, 'tcx: 'a, 'rcx: 'a> {
pub
fake_def_ids
:
RefCell
<
FxHashMap
<
CrateNum
,
DefId
>>
,
pub
all_fake_def_ids
:
RefCell
<
FxHashSet
<
DefId
>>
,
/// Maps (type_id, trait_id) -> auto trait impl
pub
generated_synthetics
:
RefCell
<
FxHashSet
<
(
DefId
,
DefId
)
>>
pub
generated_synthetics
:
RefCell
<
FxHashSet
<
(
DefId
,
DefId
)
>>
,
pub
current_item_name
:
RefCell
<
Option
<
Name
>>
,
}
impl
<
'a
,
'tcx
,
'rcx
>
DocContext
<
'a
,
'tcx
,
'rcx
>
{
...
...
@@ -383,6 +384,7 @@ pub fn run_core(search_paths: SearchPaths,
fake_def_ids
:
RefCell
::
new
(
FxHashMap
()),
all_fake_def_ids
:
RefCell
::
new
(
FxHashSet
()),
generated_synthetics
:
RefCell
::
new
(
FxHashSet
()),
current_item_name
:
RefCell
::
new
(
None
),
};
debug!
(
"crate: {:?}"
,
tcx
.hir
.krate
());
...
...
src/test/rustdoc/intra-link-self.rs
0 → 100644
浏览文件 @
88f26436
// 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.
#![crate_name
=
"foo"
]
// @has foo/index.html '//a/@href' '../foo/struct.Foo.html#method.new'
// @has foo/struct.Foo.html '//a/@href' '../foo/struct.Foo.html#method.new'
/// Use [`new`] to create a new instance.
///
/// [`new`]: Self::new
pub
struct
Foo
;
impl
Foo
{
pub
fn
new
()
->
Self
{
unimplemented!
()
}
}
// @has foo/index.html '//a/@href' '../foo/struct.Bar.html#method.new2'
// @has foo/struct.Bar.html '//a/@href' '../foo/struct.Bar.html#method.new2'
/// Use [`new2`] to create a new instance.
///
/// [`new2`]: Self::new2
pub
struct
Bar
;
impl
Bar
{
pub
fn
new2
()
->
Self
{
unimplemented!
()
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录