Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
99fbd34d
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,发现更多精彩内容 >>
提交
99fbd34d
编写于
11月 17, 2014
作者:
N
Niko Matsakis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix merge conflicts from making enum variants namespaced.
上级
d7bb01eb
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
18 addition
and
11 deletion
+18
-11
src/librustc/middle/fast_reject.rs
src/librustc/middle/fast_reject.rs
+2
-0
src/librustc/middle/traits/select.rs
src/librustc/middle/traits/select.rs
+1
-0
src/librustc/middle/typeck/check/method/mod.rs
src/librustc/middle/typeck/check/method/mod.rs
+3
-0
src/librustc/middle/typeck/check/method/probe.rs
src/librustc/middle/typeck/check/method/probe.rs
+6
-6
src/librustc/middle/typeck/infer/glb.rs
src/librustc/middle/typeck/infer/glb.rs
+1
-1
src/librustc/middle/typeck/infer/lub.rs
src/librustc/middle/typeck/infer/lub.rs
+1
-1
src/librustc/middle/typeck/infer/mod.rs
src/librustc/middle/typeck/infer/mod.rs
+3
-2
src/librustc/middle/typeck/infer/sub.rs
src/librustc/middle/typeck/infer/sub.rs
+1
-1
未找到文件。
src/librustc/middle/fast_reject.rs
浏览文件 @
99fbd34d
...
@@ -11,6 +11,8 @@
...
@@ -11,6 +11,8 @@
use
middle
::
ty
;
use
middle
::
ty
;
use
syntax
::
ast
;
use
syntax
::
ast
;
use
self
::
SimplifiedType
::
*
;
/** See `simplify_type */
/** See `simplify_type */
#[deriving(Clone,
PartialEq,
Eq,
Hash)]
#[deriving(Clone,
PartialEq,
Eq,
Hash)]
pub
enum
SimplifiedType
{
pub
enum
SimplifiedType
{
...
...
src/librustc/middle/traits/select.rs
浏览文件 @
99fbd34d
...
@@ -33,6 +33,7 @@
...
@@ -33,6 +33,7 @@
use
middle
::
ty
;
use
middle
::
ty
;
use
middle
::
typeck
::
check
::
regionmanip
;
use
middle
::
typeck
::
check
::
regionmanip
;
use
middle
::
typeck
::
infer
;
use
middle
::
typeck
::
infer
;
use
middle
::
typeck
::
infer
::
LateBoundRegionConversionTime
::
*
;
use
middle
::
typeck
::
infer
::{
InferCtxt
,
TypeSkolemizer
};
use
middle
::
typeck
::
infer
::{
InferCtxt
,
TypeSkolemizer
};
use
middle
::
ty_fold
::
TypeFoldable
;
use
middle
::
ty_fold
::
TypeFoldable
;
use
std
::
cell
::
RefCell
;
use
std
::
cell
::
RefCell
;
...
...
src/librustc/middle/typeck/check/method/mod.rs
浏览文件 @
99fbd34d
...
@@ -30,6 +30,9 @@
...
@@ -30,6 +30,9 @@
use
syntax
::
ast
;
use
syntax
::
ast
;
use
syntax
::
codemap
::
Span
;
use
syntax
::
codemap
::
Span
;
pub
use
self
::
MethodError
::
*
;
pub
use
self
::
CandidateSource
::
*
;
mod
confirm
;
mod
confirm
;
mod
doc
;
mod
doc
;
mod
probe
;
mod
probe
;
...
...
src/librustc/middle/typeck/check/method/probe.rs
浏览文件 @
99fbd34d
...
@@ -8,13 +8,9 @@
...
@@ -8,13 +8,9 @@
// option. This file may not be copied, modified, or distributed
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// except according to those terms.
use
super
::
Ambiguity
;
use
super
::{
MethodError
,
Ambiguity
,
NoMatch
};
use
super
::
CandidateSource
;
use
super
::
ImplSource
;
use
super
::
MethodError
;
use
super
::
MethodIndex
;
use
super
::
MethodIndex
;
use
super
::
NoMatch
;
use
super
::{
CandidateSource
,
ImplSource
,
TraitSource
};
use
super
::
TraitSource
;
use
middle
::
fast_reject
;
use
middle
::
fast_reject
;
use
middle
::
subst
;
use
middle
::
subst
;
...
@@ -32,6 +28,10 @@
...
@@ -32,6 +28,10 @@
use
std
::
rc
::
Rc
;
use
std
::
rc
::
Rc
;
use
util
::
ppaux
::
Repr
;
use
util
::
ppaux
::
Repr
;
use
self
::
CandidateKind
::
*
;
pub
use
self
::
PickAdjustment
::
*
;
pub
use
self
::
PickKind
::
*
;
struct
ProbeContext
<
'a
,
'tcx
:
'a
>
{
struct
ProbeContext
<
'a
,
'tcx
:
'a
>
{
fcx
:
&
'a
FnCtxt
<
'a
,
'tcx
>
,
fcx
:
&
'a
FnCtxt
<
'a
,
'tcx
>
,
span
:
Span
,
span
:
Span
,
...
...
src/librustc/middle/typeck/infer/glb.rs
浏览文件 @
99fbd34d
...
@@ -15,8 +15,8 @@
...
@@ -15,8 +15,8 @@
use
middle
::
typeck
::
infer
::
combine
::
*
;
use
middle
::
typeck
::
infer
::
combine
::
*
;
use
middle
::
typeck
::
infer
::
lattice
::
*
;
use
middle
::
typeck
::
infer
::
lattice
::
*
;
use
middle
::
typeck
::
infer
::
equate
::
Equate
;
use
middle
::
typeck
::
infer
::
equate
::
Equate
;
use
middle
::
typeck
::
infer
::
FnType
;
use
middle
::
typeck
::
infer
::
fold_regions_in_sig
;
use
middle
::
typeck
::
infer
::
fold_regions_in_sig
;
use
middle
::
typeck
::
infer
::
LateBoundRegionConversionTime
::
FnType
;
use
middle
::
typeck
::
infer
::
lub
::
Lub
;
use
middle
::
typeck
::
infer
::
lub
::
Lub
;
use
middle
::
typeck
::
infer
::
region_inference
::
RegionMark
;
use
middle
::
typeck
::
infer
::
region_inference
::
RegionMark
;
use
middle
::
typeck
::
infer
::
sub
::
Sub
;
use
middle
::
typeck
::
infer
::
sub
::
Sub
;
...
...
src/librustc/middle/typeck/infer/lub.rs
浏览文件 @
99fbd34d
...
@@ -13,9 +13,9 @@
...
@@ -13,9 +13,9 @@
use
middle
::
ty
;
use
middle
::
ty
;
use
middle
::
typeck
::
infer
::
combine
::
*
;
use
middle
::
typeck
::
infer
::
combine
::
*
;
use
middle
::
typeck
::
infer
::
equate
::
Equate
;
use
middle
::
typeck
::
infer
::
equate
::
Equate
;
use
middle
::
typeck
::
infer
::
FnType
;
use
middle
::
typeck
::
infer
::
glb
::
Glb
;
use
middle
::
typeck
::
infer
::
glb
::
Glb
;
use
middle
::
typeck
::
infer
::
lattice
::
*
;
use
middle
::
typeck
::
infer
::
lattice
::
*
;
use
middle
::
typeck
::
infer
::
LateBoundRegionConversionTime
::
FnType
;
use
middle
::
typeck
::
infer
::
sub
::
Sub
;
use
middle
::
typeck
::
infer
::
sub
::
Sub
;
use
middle
::
typeck
::
infer
::{
cres
,
InferCtxt
};
use
middle
::
typeck
::
infer
::{
cres
,
InferCtxt
};
use
middle
::
typeck
::
infer
::
fold_regions_in_sig
;
use
middle
::
typeck
::
infer
::
fold_regions_in_sig
;
...
...
src/librustc/middle/typeck/infer/mod.rs
浏览文件 @
99fbd34d
...
@@ -12,10 +12,11 @@
...
@@ -12,10 +12,11 @@
#![allow(non_camel_case_types)]
#![allow(non_camel_case_types)]
pub
use
self
::
LateBoundRegionConversionTime
::
*
;
pub
use
self
::
RegionVariableOrigin
::
*
;
pub
use
self
::
SubregionOrigin
::
*
;
pub
use
self
::
TypeOrigin
::
*
;
pub
use
self
::
TypeOrigin
::
*
;
pub
use
self
::
ValuePairs
::
*
;
pub
use
self
::
ValuePairs
::
*
;
pub
use
self
::
SubregionOrigin
::
*
;
pub
use
self
::
RegionVariableOrigin
::
*
;
pub
use
self
::
fixup_err
::
*
;
pub
use
self
::
fixup_err
::
*
;
pub
use
middle
::
ty
::
IntVarValue
;
pub
use
middle
::
ty
::
IntVarValue
;
pub
use
self
::
resolve
::
resolve_and_force_all_but_regions
;
pub
use
self
::
resolve
::
resolve_and_force_all_but_regions
;
...
...
src/librustc/middle/typeck/infer/sub.rs
浏览文件 @
99fbd34d
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
use
middle
::
typeck
::
infer
::
combine
::
*
;
use
middle
::
typeck
::
infer
::
combine
::
*
;
use
middle
::
typeck
::
infer
::{
cres
,
CresCompare
};
use
middle
::
typeck
::
infer
::{
cres
,
CresCompare
};
use
middle
::
typeck
::
infer
::
equate
::
Equate
;
use
middle
::
typeck
::
infer
::
equate
::
Equate
;
use
middle
::
typeck
::
infer
::
FnType
;
use
middle
::
typeck
::
infer
::
LateBoundRegionConversionTime
::
FnType
;
use
middle
::
typeck
::
infer
::
glb
::
Glb
;
use
middle
::
typeck
::
infer
::
glb
::
Glb
;
use
middle
::
typeck
::
infer
::
InferCtxt
;
use
middle
::
typeck
::
infer
::
InferCtxt
;
use
middle
::
typeck
::
infer
::
lub
::
Lub
;
use
middle
::
typeck
::
infer
::
lub
::
Lub
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录