Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
aa63f54e
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,发现更多精彩内容 >>
提交
aa63f54e
编写于
5月 07, 2016
作者:
S
Steve Klabnik
浏览文件
操作
浏览文件
下载
差异文件
Rollup merge of #33438 - birkenfeld:dup-words, r=steveklabnik
Fix some some duplicate words.
上级
1ce94053
26eb2bef
变更
11
显示空白变更内容
内联
并排
Showing
11 changed file
with
11 addition
and
11 deletion
+11
-11
src/bootstrap/build/job.rs
src/bootstrap/build/job.rs
+1
-1
src/librustc/session/config.rs
src/librustc/session/config.rs
+1
-1
src/librustc/traits/project.rs
src/librustc/traits/project.rs
+1
-1
src/librustc/ty/trait_def.rs
src/librustc/ty/trait_def.rs
+1
-1
src/librustc/ty/wf.rs
src/librustc/ty/wf.rs
+1
-1
src/librustc_trans/intrinsic.rs
src/librustc_trans/intrinsic.rs
+1
-1
src/libstd/net/ip.rs
src/libstd/net/ip.rs
+1
-1
src/libstd/sys/unix/process.rs
src/libstd/sys/unix/process.rs
+1
-1
src/test/codegen-units/item-collection/cross-crate-closures.rs
...est/codegen-units/item-collection/cross-crate-closures.rs
+1
-1
src/test/run-pass/regions-lub-ref-ref-rc.rs
src/test/run-pass/regions-lub-ref-ref-rc.rs
+1
-1
src/tools/linkchecker/main.rs
src/tools/linkchecker/main.rs
+1
-1
未找到文件。
src/bootstrap/build/job.rs
浏览文件 @
aa63f54e
...
...
@@ -54,7 +54,7 @@ pub unsafe fn setup() {
// Indicate that when all handles to the job object are gone that all
// process in the object should be killed. Note that this includes our
// entire process tree by default because we've added ourselves and
and
our
// entire process tree by default because we've added ourselves and our
// children will reside in the job by default.
let
mut
info
=
mem
::
zeroed
::
<
JOBOBJECT_EXTENDED_LIMIT_INFORMATION
>
();
info
.BasicLimitInformation.LimitFlags
=
JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE
;
...
...
src/librustc/session/config.rs
浏览文件 @
aa63f54e
...
...
@@ -1355,7 +1355,7 @@ pub fn check_nightly_options(matches: &getopts::Matches, flags: &[RustcOptGroup]
early_error
(
ErrorOutputType
::
default
(),
&
msg
);
}
OptionStability
::
UnstableButNotReally
=>
{
let
msg
=
format!
(
"the option `{}` is
is
unstable and should
\
let
msg
=
format!
(
"the option `{}` is unstable and should
\
only be used on the nightly compiler, but
\
it is currently accepted for backwards
\
compatibility; this will soon change,
\
...
...
src/librustc/traits/project.rs
浏览文件 @
aa63f54e
...
...
@@ -40,7 +40,7 @@
pub
enum
ProjectionMode
{
/// FIXME (#32205)
/// At coherence-checking time, we're still constructing the
/// specialization graph, and thus we only project
project
/// specialization graph, and thus we only project
/// non-`default` associated types that are defined directly in
/// the applicable impl. (This behavior should be improved over
/// time, to allow for successful projections modulo cycles
...
...
src/librustc/ty/trait_def.rs
浏览文件 @
aa63f54e
...
...
@@ -176,7 +176,7 @@ pub fn record_local_impl(&self,
/// Records a trait-to-implementation mapping for a non-local impl.
///
/// The `parent_impl` is the immediately-less-specialized impl, or the
/// trait's def ID if the impl is
is
not a specialization -- information that
/// trait's def ID if the impl is not a specialization -- information that
/// should be pulled from the metadata.
pub
fn
record_remote_impl
(
&
self
,
tcx
:
&
TyCtxt
<
'tcx
>
,
...
...
src/librustc/ty/wf.rs
浏览文件 @
aa63f54e
...
...
@@ -272,7 +272,7 @@ fn compute_trait_ref(&mut self, trait_ref: &ty::TraitRef<'tcx>) {
/// into `self.out`.
fn
compute_projection
(
&
mut
self
,
data
:
ty
::
ProjectionTy
<
'tcx
>
)
{
// A projection is well-formed if (a) the trait ref itself is
// WF
WF
and (b) the trait-ref holds. (It may also be
// WF and (b) the trait-ref holds. (It may also be
// normalizable and be WF that way.)
self
.compute_trait_ref
(
&
data
.trait_ref
);
...
...
src/librustc_trans/intrinsic.rs
浏览文件 @
aa63f54e
...
...
@@ -1327,7 +1327,7 @@ fn generate_filter_fn<'a, 'tcx>(fcx: &FunctionContext<'a, 'tcx>,
// %ret = call i32 @the_real_filter_function(%ehptrs, %arg)
// ret i32 %ret
//
// The recoverfp intrinsic is used to recover the frame
frame
pointer of the
// The recoverfp intrinsic is used to recover the frame pointer of the
// `rust_try_fn` function, which is then in turn passed to the
// `localrecover` intrinsic (pairing with the `localescape` intrinsic
// mentioned above). Putting all this together means that we now have a
...
...
src/libstd/net/ip.rs
浏览文件 @
aa63f54e
...
...
@@ -371,7 +371,7 @@ pub fn is_unicast_site_local(&self) -> bool {
}
/// Returns true if this is an address reserved for documentation
/// This is defined to be 2001:db8::/32 in RFC
RFC 3849
/// This is defined to be 2001:db8::/32 in RFC
3849.
pub
fn
is_documentation
(
&
self
)
->
bool
{
(
self
.segments
()[
0
]
==
0x2001
)
&&
(
self
.segments
()[
1
]
==
0xdb8
)
}
...
...
src/libstd/sys/unix/process.rs
浏览文件 @
aa63f54e
...
...
@@ -147,7 +147,7 @@ pub fn env(&mut self, key: &OsStr, val: &OsStr) {
let
new_key
=
pair_to_key
(
key
,
val
,
&
mut
self
.saw_nul
);
let
(
map
,
envp
)
=
self
.init_env_map
();
// If `key` is already present then we
we
just update `envp` in place
// If `key` is already present then we just update `envp` in place
// (and store the owned value), but if it's not there we override the
// trailing NULL pointer, add a new NULL pointer, and store where we
// were located.
...
...
src/test/codegen-units/item-collection/cross-crate-closures.rs
浏览文件 @
aa63f54e
...
...
@@ -27,7 +27,7 @@ fn main() {
//~ TRANS_ITEM fn cgu_extern_closures::inlined_fn_generic[0]::{{closure}}[0]<i32>
let
_
=
cgu_extern_closures
::
inlined_fn_generic
(
3
,
4
,
5i32
);
// Nothing should be generated for this call, we just link to the instance
instance
// Nothing should be generated for this call, we just link to the instance
// in the extern crate.
let
_
=
cgu_extern_closures
::
non_inlined_fn
(
6
,
7
);
}
...
...
src/test/run-pass/regions-lub-ref-ref-rc.rs
浏览文件 @
aa63f54e
...
...
@@ -9,7 +9,7 @@
// except according to those terms.
// Test a corner case of LUB coercion. In this case, one arm of the
// match requires a deref coercion and
other
other doesn't, and there
// match requires a deref coercion and
the
other doesn't, and there
// is an extra `&` on the `rc`. We want to be sure that the lifetime
// assigned to this `&rc` value is not `'a` but something smaller. In
// other words, the type from `rc` is `&'a Rc<String>` and the type
...
...
src/tools/linkchecker/main.rs
浏览文件 @
aa63f54e
...
...
@@ -110,7 +110,7 @@ fn walk(cache: &mut Cache,
if
let
Some
(
pretty_path
)
=
pretty_path
{
let
entry
=
cache
.get_mut
(
&
pretty_path
)
.unwrap
();
// we don't need the source anymore,
// so drop to
to
reduce memory-usage
// so drop to reduce memory-usage
entry
.source
=
String
::
new
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录