Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
da6d82e4
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
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,体验更适合开发者的 AI 搜索 >>
提交
da6d82e4
编写于
7月 10, 2021
作者:
G
Guillaume Gomez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Simplify build system for rustdoc-gui test crates
上级
8ccee61d
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
65 addition
and
14 deletion
+65
-14
.gitignore
.gitignore
+3
-0
src/bootstrap/test.rs
src/bootstrap/test.rs
+12
-14
src/test/rustdoc-gui/src/Cargo.lock
src/test/rustdoc-gui/src/Cargo.lock
+18
-0
src/test/rustdoc-gui/src/Cargo.toml
src/test/rustdoc-gui/src/Cargo.toml
+6
-0
src/test/rustdoc-gui/src/lib2/Cargo.toml
src/test/rustdoc-gui/src/lib2/Cargo.toml
+10
-0
src/test/rustdoc-gui/src/lib2/lib.rs
src/test/rustdoc-gui/src/lib2/lib.rs
+2
-0
src/test/rustdoc-gui/src/lib2/src/lib.rs
src/test/rustdoc-gui/src/lib2/src/lib.rs
+7
-0
src/test/rustdoc-gui/src/test_docs/Cargo.toml
src/test/rustdoc-gui/src/test_docs/Cargo.toml
+7
-0
src/test/rustdoc-gui/src/test_docs/lib.rs
src/test/rustdoc-gui/src/test_docs/lib.rs
+0
-0
未找到文件。
.gitignore
浏览文件 @
da6d82e4
...
...
@@ -72,4 +72,7 @@ __pycache__/
**node_modules
**package-lock.json
## Rustdoc GUI tests
src/test/rustdoc-gui/src/**.lock
# Before adding new lines, see the comment at the top.
src/bootstrap/test.rs
浏览文件 @
da6d82e4
...
...
@@ -907,27 +907,25 @@ fn run(self, builder: &Builder<'_>) {
// We remove existing folder to be sure there won't be artifacts remaining.
let
_
=
fs
::
remove_dir_all
(
&
out_dir
);
let
mut
nb_generated
=
0
;
let
src_path
=
"src/test/rustdoc-gui/src"
;
// We generate docs for the libraries present in the rustdoc-gui's src folder.
let
libs_dir
=
builder
.build.src
.join
(
"src/test/rustdoc-gui/src"
);
for
entry
in
libs_dir
.read_dir
()
.expect
(
"read_dir call failed"
)
{
let
entry
=
entry
.expect
(
"invalid entry"
);
let
path
=
entry
.path
();
if
path
.extension
()
.map
(|
e
|
e
==
"rs"
)
.unwrap_or
(
false
)
{
let
mut
command
=
builder
.rustdoc_cmd
(
self
.compiler
);
command
.arg
(
path
)
.arg
(
"-o"
)
.arg
(
&
out_dir
);
builder
.run
(
&
mut
command
);
nb_generated
+=
1
;
}
}
assert
!
(
nb_generated
>
0
,
"no documentation was generated..."
);
let
mut
cargo
=
Command
::
new
(
&
builder
.initial_cargo
);
cargo
.arg
(
"doc"
)
.arg
(
"--workspace"
)
.arg
(
"--target-dir"
)
.arg
(
&
out_dir
)
.env
(
"RUSTDOC"
,
builder
.rustdoc
(
self
.compiler
))
.env
(
"RUSTC"
,
builder
.rustc
(
self
.compiler
))
.current_dir
(
&
builder
.build.src
.join
(
src_path
));
builder
.run
(
&
mut
cargo
);
// We now run GUI tests.
let
mut
command
=
Command
::
new
(
&
nodejs
);
command
.arg
(
builder
.build.src
.join
(
"src/tools/rustdoc-gui/tester.js"
))
.arg
(
"--doc-folder"
)
.arg
(
out_dir
)
.arg
(
out_dir
.join
(
"doc"
)
)
.arg
(
"--tests-folder"
)
.arg
(
builder
.build.src
.join
(
"src/test/rustdoc-gui"
));
for
path
in
&
builder
.paths
{
...
...
src/test/rustdoc-gui/src/Cargo.lock
0 → 100644
浏览文件 @
da6d82e4
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "implementors"
version = "0.1.0"
[[package]]
name = "lib2"
version = "0.1.0"
dependencies = [
"implementors",
]
[[package]]
name = "test_docs"
version = "0.1.0"
src/test/rustdoc-gui/src/Cargo.toml
0 → 100644
浏览文件 @
da6d82e4
[workspace]
members
=
[
"test_docs"
,
"lib2"
,
"implementors"
,
]
src/test/rustdoc-gui/src/lib2/Cargo.toml
0 → 100644
浏览文件 @
da6d82e4
[package]
name
=
"lib2"
version
=
"0.1.0"
edition
=
"2018"
[lib]
path
=
"lib.rs"
[dependencies]
implementors
=
{
path
=
"../implementors"
}
src/test/rustdoc-gui/src/lib2.rs
→
src/test/rustdoc-gui/src/lib2
/lib
.rs
浏览文件 @
da6d82e4
...
...
@@ -31,3 +31,5 @@ impl Trait for Foo {
type
X
=
u32
;
const
Y
:
u32
=
0
;
}
impl
implementors
::
Whatever
for
Foo
{}
src/test/rustdoc-gui/src/lib2/src/lib.rs
0 → 100644
浏览文件 @
da6d82e4
#[cfg(test)]
mod
tests
{
#[test]
fn
it_works
()
{
assert_eq!
(
2
+
2
,
4
);
}
}
src/test/rustdoc-gui/src/test_docs/Cargo.toml
0 → 100644
浏览文件 @
da6d82e4
[package]
name
=
"test_docs"
version
=
"0.1.0"
edition
=
"2018"
[lib]
path
=
"lib.rs"
src/test/rustdoc-gui/src/lib.rs
→
src/test/rustdoc-gui/src/
test_docs/
lib.rs
浏览文件 @
da6d82e4
文件已移动
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录