Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
8577bb49
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,发现更多精彩内容 >>
提交
8577bb49
编写于
5月 31, 2019
作者:
V
varkor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor `ConstVariableOrigin` into `ConstVariableOrigin` and `ConstVariableOriginKind`
上级
4dcc49c6
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
54 addition
and
20 deletion
+54
-20
src/librustc/infer/canonical/mod.rs
src/librustc/infer/canonical/mod.rs
+9
-3
src/librustc/infer/combine.rs
src/librustc/infer/combine.rs
+6
-2
src/librustc/infer/mod.rs
src/librustc/infer/mod.rs
+9
-3
src/librustc/infer/resolve.rs
src/librustc/infer/resolve.rs
+6
-3
src/librustc/infer/unify_key.rs
src/librustc/infer/unify_key.rs
+15
-6
src/librustc_typeck/check/_match.rs
src/librustc_typeck/check/_match.rs
+4
-1
src/librustc_typeck/check/method/probe.rs
src/librustc_typeck/check/method/probe.rs
+5
-2
未找到文件。
src/librustc/infer/canonical/mod.rs
浏览文件 @
8577bb49
...
...
@@ -22,7 +22,7 @@
//! [c]: https://rust-lang.github.io/rustc-guide/traits/canonicalization.html
use
crate
::
infer
::{
InferCtxt
,
RegionVariableOrigin
,
TypeVariableOrigin
,
TypeVariableOriginKind
};
use
crate
::
infer
::
ConstVariableOrigin
;
use
crate
::
infer
::
{
ConstVariableOrigin
,
ConstVariableOriginKind
}
;
use
crate
::
mir
::
interpret
::
ConstValue
;
use
rustc_data_structures
::
indexed_vec
::
IndexVec
;
use
rustc_macros
::
HashStable
;
...
...
@@ -407,10 +407,16 @@ fn instantiate_canonical_var(
CanonicalVarKind
::
Const
(
ui
)
=>
{
self
.next_const_var_in_universe
(
self
.next_ty_var_in_universe
(
TypeVariableOrigin
::
MiscVariable
(
span
),
TypeVariableOrigin
{
kind
:
TypeVariableOriginKind
::
MiscVariable
,
span
,
},
universe_map
(
ui
),
),
ConstVariableOrigin
::
MiscVariable
(
span
),
ConstVariableOrigin
{
kind
:
ConstVariableOriginKind
::
MiscVariable
,
span
,
},
universe_map
(
ui
),
)
.into
()
}
...
...
src/librustc/infer/combine.rs
浏览文件 @
8577bb49
...
...
@@ -28,7 +28,8 @@
use
super
::
lub
::
Lub
;
use
super
::
sub
::
Sub
;
use
super
::
type_variable
::
TypeVariableValue
;
use
super
::
unify_key
::{
ConstVarValue
,
ConstVariableValue
,
ConstVariableOrigin
};
use
super
::
unify_key
::{
ConstVarValue
,
ConstVariableValue
};
use
super
::
unify_key
::{
ConstVariableOrigin
,
ConstVariableOriginKind
};
use
crate
::
hir
::
def_id
::
DefId
;
use
crate
::
mir
::
interpret
::
ConstValue
;
...
...
@@ -165,7 +166,10 @@ pub fn unify_const_variable(
self
.const_unification_table
.borrow_mut
()
.unify_var_value
(
vid
,
ConstVarValue
{
origin
:
ConstVariableOrigin
::
ConstInference
(
DUMMY_SP
),
origin
:
ConstVariableOrigin
{
kind
:
ConstVariableOriginKind
::
ConstInference
,
span
:
DUMMY_SP
,
},
val
:
ConstVariableValue
::
Known
{
value
},
})
.map_err
(|
e
|
const_unification_error
(
vid_is_expected
,
e
))
?
;
...
...
src/librustc/infer/mod.rs
浏览文件 @
8577bb49
...
...
@@ -40,7 +40,7 @@
use
self
::
region_constraints
::{
GenericKind
,
RegionConstraintData
,
VarInfos
,
VerifyBound
};
use
self
::
region_constraints
::{
RegionConstraintCollector
,
RegionSnapshot
};
use
self
::
type_variable
::{
TypeVariableOrigin
,
TypeVariableOriginKind
};
use
self
::
unify_key
::{
ToType
,
ConstVariableOrigin
};
use
self
::
unify_key
::{
ToType
,
ConstVariableOrigin
,
ConstVariableOriginKind
};
pub
mod
at
;
pub
mod
canonical
;
...
...
@@ -1119,7 +1119,10 @@ pub fn var_for_def(&self, span: Span, param: &ty::GenericParamDef) -> Kind<'tcx>
self
.tcx
.mk_ty_var
(
ty_var_id
)
.into
()
}
GenericParamDefKind
::
Const
{
..
}
=>
{
let
origin
=
ConstVariableOrigin
::
ConstParameterDefinition
(
span
,
param
.name
);
let
origin
=
ConstVariableOrigin
{
kind
:
ConstVariableOriginKind
::
ConstParameterDefinition
(
param
.name
),
span
,
};
let
const_var_id
=
self
.const_unification_table
.borrow_mut
()
...
...
@@ -1421,7 +1424,10 @@ pub fn replace_bound_vars_with_fresh_vars<T>(
span
,
})
};
let
fld_c
=
|
_
,
ty
|
self
.next_const_var
(
ty
,
ConstVariableOrigin
::
MiscVariable
(
span
));
let
fld_c
=
|
_
,
ty
|
self
.next_const_var
(
ty
,
ConstVariableOrigin
{
kind
:
ConstVariableOriginKind
::
MiscVariable
,
span
,
});
self
.tcx
.replace_bound_vars
(
value
,
fld_r
,
fld_t
,
fld_c
)
}
...
...
src/librustc/infer/resolve.rs
浏览文件 @
8577bb49
use
super
::{
InferCtxt
,
FixupError
,
FixupResult
,
Span
,
type_variable
::
TypeVariableOrigin
};
use
super
::{
InferCtxt
,
FixupError
,
FixupResult
,
Span
};
use
super
::
type_variable
::{
TypeVariableOrigin
,
TypeVariableOriginKind
};
use
crate
::
mir
::
interpret
::
ConstValue
;
use
crate
::
ty
::{
self
,
Ty
,
Const
,
TyCtxt
,
TypeFoldable
,
InferConst
,
TypeFlags
};
use
crate
::
ty
::
fold
::{
TypeFolder
,
TypeVisitor
};
...
...
@@ -123,8 +124,10 @@ fn visit_ty(&mut self, t: Ty<'tcx>) -> bool {
let
ty_var_span
=
if
let
ty
::
TyVar
(
ty_vid
)
=
infer_ty
{
let
ty_vars
=
self
.infcx.type_variables
.borrow
();
if
let
TypeVariableOrigin
::
TypeParameterDefinition
(
span
,
_
name
)
=
*
ty_vars
.var_origin
(
ty_vid
)
if
let
TypeVariableOrigin
{
kind
:
TypeVariableOriginKind
::
TypeParameterDefinition
(
_
),
span
,
}
=
*
ty_vars
.var_origin
(
ty_vid
)
{
Some
(
span
)
}
else
{
...
...
src/librustc/infer/unify_key.rs
浏览文件 @
8577bb49
...
...
@@ -79,13 +79,19 @@ fn to_type<'a, 'gcx, 'tcx>(&self, tcx: TyCtxt<'a, 'gcx, 'tcx>) -> Ty<'tcx> {
// Generic consts.
#[derive(Copy,
Clone,
Debug)]
pub
struct
ConstVariableOrigin
{
pub
kind
:
ConstVariableOriginKind
,
pub
span
:
Span
,
}
/// Reasons to create a const inference variable
#[derive(Copy,
Clone,
Debug)]
pub
enum
ConstVariableOrigin
{
MiscVariable
(
Span
)
,
ConstInference
(
Span
)
,
ConstParameterDefinition
(
Span
,
InternedString
),
SubstitutionPlaceholder
(
Span
)
,
pub
enum
ConstVariableOrigin
Kind
{
MiscVariable
,
ConstInference
,
ConstParameterDefinition
(
InternedString
),
SubstitutionPlaceholder
,
}
#[derive(Copy,
Clone,
Debug)]
...
...
@@ -159,7 +165,10 @@ fn unify_values(value1: &Self, value2: &Self) -> Result<Self, Self::Error> {
}
?
;
Ok
(
ConstVarValue
{
origin
:
ConstVariableOrigin
::
ConstInference
(
DUMMY_SP
),
origin
:
ConstVariableOrigin
{
kind
:
ConstVariableOriginKind
::
ConstInference
,
span
:
DUMMY_SP
,
},
val
,
})
}
...
...
src/librustc_typeck/check/_match.rs
浏览文件 @
8577bb49
...
...
@@ -1009,7 +1009,10 @@ fn demand_discriminant_type(
// ...but otherwise we want to use any supertype of the
// discriminant. This is sort of a workaround, see note (*) in
// `check_pat` for some details.
let
discrim_ty
=
self
.next_ty_var
(
TypeVariableOrigin
::
TypeInference
(
discrim
.span
));
let
discrim_ty
=
self
.next_ty_var
(
TypeVariableOrigin
{
kind
:
TypeVariableOriginKind
::
TypeInference
,
span
:
discrim
.span
,
});
self
.check_expr_has_type_or_error
(
discrim
,
discrim_ty
);
discrim_ty
}
...
...
src/librustc_typeck/check/method/probe.rs
浏览文件 @
8577bb49
...
...
@@ -21,7 +21,7 @@
use
rustc
::
ty
::{
self
,
ParamEnvAnd
,
Ty
,
TyCtxt
,
ToPolyTraitRef
,
ToPredicate
,
TraitRef
,
TypeFoldable
};
use
rustc
::
ty
::
GenericParamDefKind
;
use
rustc
::
infer
::
type_variable
::{
TypeVariableOrigin
,
TypeVariableOriginKind
};
use
rustc
::
infer
::
unify_key
::
ConstVariableOrigin
;
use
rustc
::
infer
::
unify_key
::
{
ConstVariableOrigin
,
ConstVariableOriginKind
}
;
use
rustc
::
util
::
nodemap
::
FxHashSet
;
use
rustc
::
infer
::{
self
,
InferOk
};
use
rustc
::
infer
::
canonical
::{
Canonical
,
QueryResponse
};
...
...
@@ -1580,7 +1580,10 @@ fn fresh_item_substs(&self, def_id: DefId) -> SubstsRef<'tcx> {
}
GenericParamDefKind
::
Const
{
..
}
=>
{
let
span
=
self
.tcx
.def_span
(
def_id
);
let
origin
=
ConstVariableOrigin
::
SubstitutionPlaceholder
(
span
);
let
origin
=
ConstVariableOrigin
{
kind
:
ConstVariableOriginKind
::
SubstitutionPlaceholder
,
span
,
};
self
.next_const_var
(
self
.tcx
.type_of
(
param
.def_id
),
origin
)
.into
()
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录