Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
2628f3cc
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,发现更多精彩内容 >>
提交
2628f3cc
编写于
3月 22, 2016
作者:
J
Jorge Aparicio
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix alignment
上级
bd71d11a
变更
32
显示空白变更内容
内联
并排
Showing
32 changed file
with
458 addition
and
473 deletion
+458
-473
src/compiletest/compiletest.rs
src/compiletest/compiletest.rs
+4
-4
src/librustc/middle/def_id.rs
src/librustc/middle/def_id.rs
+1
-1
src/librustc/middle/infer/combine.rs
src/librustc/middle/infer/combine.rs
+8
-10
src/librustc/middle/infer/sub.rs
src/librustc/middle/infer/sub.rs
+2
-2
src/librustc/middle/traits/select.rs
src/librustc/middle/traits/select.rs
+8
-8
src/librustc/middle/ty/relate.rs
src/librustc/middle/ty/relate.rs
+7
-7
src/librustc/mir/repr.rs
src/librustc/mir/repr.rs
+2
-2
src/librustc/util/ppaux.rs
src/librustc/util/ppaux.rs
+5
-5
src/librustc_back/target/mod.rs
src/librustc_back/target/mod.rs
+1
-1
src/librustc_borrowck/borrowck/mir/graphviz.rs
src/librustc_borrowck/borrowck/mir/graphviz.rs
+21
-21
src/librustc_driver/driver.rs
src/librustc_driver/driver.rs
+16
-16
src/librustc_front/print/pprust.rs
src/librustc_front/print/pprust.rs
+53
-53
src/librustc_mir/graphviz.rs
src/librustc_mir/graphviz.rs
+5
-5
src/librustc_trans/back/archive.rs
src/librustc_trans/back/archive.rs
+2
-2
src/librustc_trans/trans/consts.rs
src/librustc_trans/trans/consts.rs
+1
-1
src/librustc_typeck/astconv.rs
src/librustc_typeck/astconv.rs
+4
-4
src/librustc_typeck/check/dropck.rs
src/librustc_typeck/check/dropck.rs
+5
-6
src/librustc_typeck/lib.rs
src/librustc_typeck/lib.rs
+4
-8
src/librustdoc/html/format.rs
src/librustdoc/html/format.rs
+13
-14
src/librustdoc/html/highlight.rs
src/librustdoc/html/highlight.rs
+2
-3
src/librustdoc/html/render.rs
src/librustdoc/html/render.rs
+136
-137
src/librustdoc/html/toc.rs
src/librustdoc/html/toc.rs
+4
-4
src/libstd/sys/common/net.rs
src/libstd/sys/common/net.rs
+6
-6
src/libstd/sys/unix/ext/net.rs
src/libstd/sys/unix/ext/net.rs
+5
-5
src/libstd/sys/unix/os.rs
src/libstd/sys/unix/os.rs
+6
-6
src/libstd/sys/unix/process.rs
src/libstd/sys/unix/process.rs
+1
-1
src/libstd/sys/windows/fs.rs
src/libstd/sys/windows/fs.rs
+1
-1
src/libstd/sys/windows/process.rs
src/libstd/sys/windows/process.rs
+2
-2
src/libsyntax/codemap.rs
src/libsyntax/codemap.rs
+65
-65
src/libsyntax/errors/emitter.rs
src/libsyntax/errors/emitter.rs
+12
-12
src/libsyntax/parse/parser.rs
src/libsyntax/parse/parser.rs
+21
-20
src/libsyntax/print/pprust.rs
src/libsyntax/print/pprust.rs
+35
-41
未找到文件。
src/compiletest/compiletest.rs
浏览文件 @
2628f3cc
...
...
@@ -314,7 +314,7 @@ fn collect_tests_from_dir(config: &Config,
collect_tests_from_dir
(
config
,
base
,
&
file_path
,
&
relative_file_path
,
relative_file_path
,
tests
)
?
;
}
}
...
...
src/librustc/middle/def_id.rs
浏览文件 @
2628f3cc
src/librustc/middle/infer/combine.rs
浏览文件 @
2628f3cc
...
...
@@ -123,8 +123,7 @@ fn unify_integral_variable<'a,'tcx>(infcx: &InferCtxt<'a,'tcx>,
val
:
ty
::
IntVarValue
)
->
RelateResult
<
'tcx
,
Ty
<
'tcx
>>
{
infcx
.int_unification_table
infcx
.int_unification_table
.borrow_mut
()
.unify_var_value
(
vid
,
val
)
.map_err
(|
e
|
int_unification_error
(
vid_is_expected
,
e
))
?
;
...
...
@@ -140,8 +139,7 @@ fn unify_float_variable<'a,'tcx>(infcx: &InferCtxt<'a,'tcx>,
val
:
ast
::
FloatTy
)
->
RelateResult
<
'tcx
,
Ty
<
'tcx
>>
{
infcx
.float_unification_table
infcx
.float_unification_table
.borrow_mut
()
.unify_var_value
(
vid
,
val
)
.map_err
(|
e
|
float_unification_error
(
vid_is_expected
,
e
))
?
;
...
...
src/librustc/middle/infer/sub.rs
浏览文件 @
2628f3cc
src/librustc/middle/traits/select.rs
浏览文件 @
2628f3cc
src/librustc/middle/ty/relate.rs
浏览文件 @
2628f3cc
src/librustc/mir/repr.rs
浏览文件 @
2628f3cc
src/librustc/util/ppaux.rs
浏览文件 @
2628f3cc
src/librustc_back/target/mod.rs
浏览文件 @
2628f3cc
src/librustc_borrowck/borrowck/mir/graphviz.rs
浏览文件 @
2628f3cc
src/librustc_driver/driver.rs
浏览文件 @
2628f3cc
src/librustc_front/print/pprust.rs
浏览文件 @
2628f3cc
src/librustc_mir/graphviz.rs
浏览文件 @
2628f3cc
src/librustc_trans/back/archive.rs
浏览文件 @
2628f3cc
src/librustc_trans/trans/consts.rs
浏览文件 @
2628f3cc
src/librustc_typeck/astconv.rs
浏览文件 @
2628f3cc
src/librustc_typeck/check/dropck.rs
浏览文件 @
2628f3cc
...
...
@@ -469,8 +469,7 @@ fn iterate_over_potentially_unsafe_regions_in_type<'a, 'b, 'tcx>(
ty
::
TyTuple
(
ref
tys
)
|
ty
::
TyClosure
(
_
,
box
ty
::
ClosureSubsts
{
upvar_tys
:
ref
tys
,
..
})
=>
{
for
ty
in
tys
{
iterate_over_potentially_unsafe_regions_in_type
(
cx
,
context
,
ty
,
depth
+
1
)
?
iterate_over_potentially_unsafe_regions_in_type
(
cx
,
context
,
ty
,
depth
+
1
)
?
}
Ok
(())
}
...
...
src/librustc_typeck/lib.rs
浏览文件 @
2628f3cc
...
...
@@ -354,17 +354,13 @@ pub fn check_crate(tcx: &TyCtxt, trait_map: ty::TraitMap) -> CompileResult {
coherence
::
check_coherence
(
&
ccx
));
})
?
;
time
(
time_passes
,
"wf checking"
,
||
check
::
check_wf_new
(
&
ccx
))
?
;
time
(
time_passes
,
"wf checking"
,
||
check
::
check_wf_new
(
&
ccx
))
?
;
time
(
time_passes
,
"item-types checking"
,
||
check
::
check_item_types
(
&
ccx
))
?
;
time
(
time_passes
,
"item-types checking"
,
||
check
::
check_item_types
(
&
ccx
))
?
;
time
(
time_passes
,
"item-bodies checking"
,
||
check
::
check_item_bodies
(
&
ccx
))
?
;
time
(
time_passes
,
"item-bodies checking"
,
||
check
::
check_item_bodies
(
&
ccx
))
?
;
time
(
time_passes
,
"drop-impl checking"
,
||
check
::
check_drop_impls
(
&
ccx
))
?
;
time
(
time_passes
,
"drop-impl checking"
,
||
check
::
check_drop_impls
(
&
ccx
))
?
;
check_for_entry_fn
(
&
ccx
);
...
...
src/librustdoc/html/format.rs
浏览文件 @
2628f3cc
...
...
@@ -508,8 +508,7 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
primitive_link
(
f
,
clean
::
Slice
,
&
format!
(
"&{}{}[{}]"
,
lt
,
m
,
**
bt
)),
_
=>
{
primitive_link
(
f
,
clean
::
Slice
,
&
format!
(
"&{}{}["
,
lt
,
m
))
?
;
primitive_link
(
f
,
clean
::
Slice
,
&
format!
(
"&{}{}["
,
lt
,
m
))
?
;
write!
(
f
,
"{}"
,
**
bt
)
?
;
primitive_link
(
f
,
clean
::
Slice
,
"]"
)
}
...
...
src/librustdoc/html/highlight.rs
浏览文件 @
2628f3cc
...
...
@@ -180,8 +180,7 @@ fn doit(sess: &parse::ParseSess, mut lexer: lexer::StringReader,
if
klass
==
""
{
write!
(
out
,
"{}"
,
Escape
(
&
snip
))
?
;
}
else
{
write!
(
out
,
"<span class='{}'>{}</span>"
,
klass
,
Escape
(
&
snip
))
?
;
write!
(
out
,
"<span class='{}'>{}</span>"
,
klass
,
Escape
(
&
snip
))
?
;
}
}
...
...
src/librustdoc/html/render.rs
浏览文件 @
2628f3cc
...
...
@@ -1739,8 +1739,7 @@ fn cmp(i1: &clean::Item, i2: &clean::Item, idx1: usize, idx2: usize) -> Ordering
<td class='docblock short'>
{stab_docs} {docs}
</td>
</tr>
"
,
</tr>"
,
name
=
*
myitem
.name
.as_ref
()
.unwrap
(),
stab_docs
=
stab_docs
,
docs
=
shorter
(
Some
(
&
Markdown
(
doc_value
)
.to_string
())),
...
...
src/librustdoc/html/toc.rs
浏览文件 @
2628f3cc
src/libstd/sys/common/net.rs
浏览文件 @
2628f3cc
src/libstd/sys/unix/ext/net.rs
浏览文件 @
2628f3cc
src/libstd/sys/unix/os.rs
浏览文件 @
2628f3cc
src/libstd/sys/unix/process.rs
浏览文件 @
2628f3cc
src/libstd/sys/windows/fs.rs
浏览文件 @
2628f3cc
src/libstd/sys/windows/process.rs
浏览文件 @
2628f3cc
src/libsyntax/codemap.rs
浏览文件 @
2628f3cc
src/libsyntax/errors/emitter.rs
浏览文件 @
2628f3cc
src/libsyntax/parse/parser.rs
浏览文件 @
2628f3cc
...
...
@@ -3612,7 +3612,8 @@ pub fn parse_pat(&mut self) -> PResult<'a, P<Pat>> {
let
path
=
ident_to_path
(
ident_span
,
ident
);
self
.bump
();
let
delim
=
self
.expect_open_delim
()
?
;
let
tts
=
self
.parse_seq_to_end
(
&
token
::
CloseDelim
(
delim
),
let
tts
=
self
.parse_seq_to_end
(
&
token
::
CloseDelim
(
delim
),
SeqSep
::
none
(),
|
p
|
p
.parse_token_tree
())
?
;
let
mac
=
Mac_
{
path
:
path
,
tts
:
tts
,
ctxt
:
EMPTY_CTXT
};
pat
=
PatKind
::
Mac
(
codemap
::
Spanned
{
node
:
mac
,
...
...
src/libsyntax/print/pprust.rs
浏览文件 @
2628f3cc
...
...
@@ -1058,8 +1058,7 @@ pub fn print_foreign_item(&mut self,
self
.end
()
// end the outer fn box
}
ast
::
ForeignItemKind
::
Static
(
ref
t
,
m
)
=>
{
self
.head
(
&
visibility_qualified
(
item
.vis
,
"static"
))
?
;
self
.head
(
&
visibility_qualified
(
item
.vis
,
"static"
))
?
;
if
m
{
self
.word_space
(
"mut"
)
?
;
}
...
...
@@ -1119,8 +1118,7 @@ pub fn print_item(&mut self, item: &ast::Item) -> io::Result<()> {
self
.ann
.pre
(
self
,
NodeItem
(
item
))
?
;
match
item
.node
{
ast
::
ItemKind
::
ExternCrate
(
ref
optional_path
)
=>
{
self
.head
(
&
visibility_qualified
(
item
.vis
,
"extern crate"
))
?
;
self
.head
(
&
visibility_qualified
(
item
.vis
,
"extern crate"
))
?
;
if
let
Some
(
p
)
=
*
optional_path
{
let
val
=
p
.as_str
();
if
val
.contains
(
"-"
)
{
...
...
@@ -1138,16 +1136,14 @@ pub fn print_item(&mut self, item: &ast::Item) -> io::Result<()> {
self
.end
()
?
;
// end outer head-block
}
ast
::
ItemKind
::
Use
(
ref
vp
)
=>
{
self
.head
(
&
visibility_qualified
(
item
.vis
,
"use"
))
?
;
self
.head
(
&
visibility_qualified
(
item
.vis
,
"use"
))
?
;
self
.print_view_path
(
&
vp
)
?
;
word
(
&
mut
self
.s
,
";"
)
?
;
self
.end
()
?
;
// end inner head-block
self
.end
()
?
;
// end outer head-block
}
ast
::
ItemKind
::
Static
(
ref
ty
,
m
,
ref
expr
)
=>
{
self
.head
(
&
visibility_qualified
(
item
.vis
,
"static"
))
?
;
self
.head
(
&
visibility_qualified
(
item
.vis
,
"static"
))
?
;
if
m
==
ast
::
Mutability
::
Mutable
{
self
.word_space
(
"mut"
)
?
;
}
...
...
@@ -1163,8 +1159,7 @@ pub fn print_item(&mut self, item: &ast::Item) -> io::Result<()> {
self
.end
()
?
;
// end the outer cbox
}
ast
::
ItemKind
::
Const
(
ref
ty
,
ref
expr
)
=>
{
self
.head
(
&
visibility_qualified
(
item
.vis
,
"const"
))
?
;
self
.head
(
&
visibility_qualified
(
item
.vis
,
"const"
))
?
;
self
.print_ident
(
item
.ident
)
?
;
self
.word_space
(
":"
)
?
;
self
.print_type
(
&
ty
)
?
;
...
...
@@ -1192,8 +1187,7 @@ pub fn print_item(&mut self, item: &ast::Item) -> io::Result<()> {
self
.print_block_with_attrs
(
&
body
,
&
item
.attrs
)
?
;
}
ast
::
ItemKind
::
Mod
(
ref
_
mod
)
=>
{
self
.head
(
&
visibility_qualified
(
item
.vis
,
"mod"
))
?
;
self
.head
(
&
visibility_qualified
(
item
.vis
,
"mod"
))
?
;
self
.print_ident
(
item
.ident
)
?
;
self
.nbsp
()
?
;
self
.bopen
()
?
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录