Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
b7ce2303
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,发现更多精彩内容 >>
提交
b7ce2303
编写于
5月 07, 2015
作者:
S
Steve Klabnik
浏览文件
操作
浏览文件
下载
差异文件
Rollup merge of #25138 - tshepang:typos, r=sanxiyn
上级
42212bb4
8227db86
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
8 addition
and
8 deletion
+8
-8
src/librustc/middle/resolve_lifetime.rs
src/librustc/middle/resolve_lifetime.rs
+3
-3
src/librustc_typeck/astconv.rs
src/librustc_typeck/astconv.rs
+1
-1
src/librustdoc/clean/mod.rs
src/librustdoc/clean/mod.rs
+1
-1
src/libstd/sys/unix/process2.rs
src/libstd/sys/unix/process2.rs
+1
-1
src/rt/valgrind/valgrind.h
src/rt/valgrind/valgrind.h
+1
-1
src/test/run-pass/issue-20616.rs
src/test/run-pass/issue-20616.rs
+1
-1
未找到文件。
src/librustc/middle/resolve_lifetime.rs
浏览文件 @
b7ce2303
...
...
@@ -374,7 +374,7 @@ impl<'v, 'a> Visitor<'v> for GatherLabels<'a> {
fn
visit_expr
(
&
mut
self
,
ex
:
&
'v
ast
::
Expr
)
{
if
let
Some
(
label
)
=
expression_label
(
ex
)
{
for
&
(
prior
,
prior_span
)
in
&
self
.labels_in_fn
[
..
]
{
// FIXME (#24278): non-hygienic comparis
i
on
// FIXME (#24278): non-hygienic comparison
if
label
.name
==
prior
.name
{
signal_shadowing_problem
(
self
.sess
,
label
.name
,
...
...
@@ -420,7 +420,7 @@ fn check_if_label_shadows_lifetime<'a>(sess: &'a Session,
EarlyScope
(
_
,
lifetimes
,
s
)
|
LateScope
(
lifetimes
,
s
)
=>
{
for
lifetime_def
in
lifetimes
{
// FIXME (#24278): non-hygienic comparis
i
on
// FIXME (#24278): non-hygienic comparison
if
label
.name
==
lifetime_def
.lifetime.name
{
signal_shadowing_problem
(
sess
,
...
...
@@ -677,7 +677,7 @@ fn check_lifetime_def_for_shadowing(&self,
lifetime
:
&
ast
::
Lifetime
)
{
for
&
(
label
,
label_span
)
in
&
self
.labels_in_fn
{
// FIXME (#24278): non-hygienic comparis
i
on
// FIXME (#24278): non-hygienic comparison
if
lifetime
.name
==
label
.name
{
signal_shadowing_problem
(
self
.sess
,
lifetime
.name
,
...
...
src/librustc_typeck/astconv.rs
浏览文件 @
b7ce2303
...
...
@@ -1344,7 +1344,7 @@ pub fn ast_ty_arg_to_ty<'tcx>(this: &AstConv<'tcx>,
}
// Check the base def in a PathResolution and convert it to a Ty. If there are
// associated types in the PathResolution, these will need to be sep
e
rately
// associated types in the PathResolution, these will need to be sep
a
rately
// resolved.
fn
base_def_to_ty
<
'tcx
>
(
this
:
&
AstConv
<
'tcx
>
,
rscope
:
&
RegionScope
,
...
...
src/librustdoc/clean/mod.rs
浏览文件 @
b7ce2303
...
...
@@ -944,7 +944,7 @@ fn clean(&self, cx: &DocContext) -> Generics {
// a Sized bound, removing the bounds as we find them.
//
// Note that associated types also have a sized bound by default, but we
// don't actually k
on
w the set of associated types right here so that's
// don't actually k
no
w the set of associated types right here so that's
// handled in cleaning associated types
let
mut
sized_params
=
HashSet
::
new
();
where_predicates
.retain
(|
pred
|
{
...
...
src/libstd/sys/unix/process2.rs
浏览文件 @
b7ce2303
...
...
@@ -328,7 +328,7 @@ pub fn try_wait(&self) -> Option<ExitStatus> {
})
{
Ok
(
0
)
=>
None
,
Ok
(
n
)
if
n
==
self
.pid
=>
Some
(
translate_status
(
status
)),
Ok
(
n
)
=>
panic!
(
"unkown pid: {}"
,
n
),
Ok
(
n
)
=>
panic!
(
"unk
n
own pid: {}"
,
n
),
Err
(
e
)
=>
panic!
(
"unknown waitpid error: {}"
,
e
),
}
}
...
...
src/rt/valgrind/valgrind.h
浏览文件 @
b7ce2303
...
...
@@ -5122,7 +5122,7 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
/* These requests allow control to move from the simulated CPU to the
real CPU, calling an arbitary function.
real CPU, calling an arbit
r
ary function.
Note that the current ThreadId is inserted as the first argument.
So this call:
...
...
src/test/run-pass/issue-20616.rs
浏览文件 @
b7ce2303
...
...
@@ -32,7 +32,7 @@
// type argument with trailing comma
type
TypeG
<
T
>
=
Box
<
T
,
>
;
// trailing comma on liftime defs
// trailing comma on lif
e
time defs
type
TypeH
<
'a
,
>
=
&
'a
();
// trailing comma on type argument
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录