Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
71ce2e7e
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,发现更多精彩内容 >>
提交
71ce2e7e
编写于
6月 11, 2018
作者:
N
Niko Matsakis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
make `Eq` a true query
上级
1acffada
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
80 addition
and
48 deletion
+80
-48
src/librustc/dep_graph/dep_node.rs
src/librustc/dep_graph/dep_node.rs
+4
-2
src/librustc/traits/query/mod.rs
src/librustc/traits/query/mod.rs
+3
-0
src/librustc/traits/query/type_op/eq.rs
src/librustc/traits/query/type_op/eq.rs
+10
-22
src/librustc/ty/query/config.rs
src/librustc/ty/query/config.rs
+9
-1
src/librustc/ty/query/keys.rs
src/librustc/ty/query/keys.rs
+7
-22
src/librustc/ty/query/mod.rs
src/librustc/ty/query/mod.rs
+9
-1
src/librustc/ty/query/plumbing.rs
src/librustc/ty/query/plumbing.rs
+1
-0
src/librustc_traits/lib.rs
src/librustc_traits/lib.rs
+2
-0
src/librustc_traits/type_op_eq.rs
src/librustc_traits/type_op_eq.rs
+35
-0
未找到文件。
src/librustc/dep_graph/dep_node.rs
浏览文件 @
71ce2e7e
...
@@ -70,8 +70,9 @@
...
@@ -70,8 +70,9 @@
use
std
::
fmt
;
use
std
::
fmt
;
use
std
::
hash
::
Hash
;
use
std
::
hash
::
Hash
;
use
syntax_pos
::
symbol
::
InternedString
;
use
syntax_pos
::
symbol
::
InternedString
;
use
traits
::
query
::{
CanonicalProjectionGoal
,
use
traits
::
query
::{
CanonicalTyGoal
,
CanonicalPredicateGoal
};
CanonicalProjectionGoal
,
CanonicalTyGoal
,
CanonicalTypeOpEqGoal
,
CanonicalPredicateGoal
,
};
use
ty
::{
TyCtxt
,
Instance
,
InstanceDef
,
ParamEnv
,
ParamEnvAnd
,
PolyTraitRef
,
Ty
};
use
ty
::{
TyCtxt
,
Instance
,
InstanceDef
,
ParamEnv
,
ParamEnvAnd
,
PolyTraitRef
,
Ty
};
use
ty
::
subst
::
Substs
;
use
ty
::
subst
::
Substs
;
...
@@ -647,6 +648,7 @@ pub fn fingerprint_needed_for_crate_hash(self) -> bool {
...
@@ -647,6 +648,7 @@ pub fn fingerprint_needed_for_crate_hash(self) -> bool {
[]
NormalizeTyAfterErasingRegions
(
ParamEnvAnd
<
'tcx
,
Ty
<
'tcx
>>
),
[]
NormalizeTyAfterErasingRegions
(
ParamEnvAnd
<
'tcx
,
Ty
<
'tcx
>>
),
[]
DropckOutlives
(
CanonicalTyGoal
<
'tcx
>
),
[]
DropckOutlives
(
CanonicalTyGoal
<
'tcx
>
),
[]
EvaluateObligation
(
CanonicalPredicateGoal
<
'tcx
>
),
[]
EvaluateObligation
(
CanonicalPredicateGoal
<
'tcx
>
),
[]
TypeOpEq
(
CanonicalTypeOpEqGoal
<
'tcx
>
),
[]
SubstituteNormalizeAndTestPredicates
{
key
:
(
DefId
,
&
'tcx
Substs
<
'tcx
>
)
},
[]
SubstituteNormalizeAndTestPredicates
{
key
:
(
DefId
,
&
'tcx
Substs
<
'tcx
>
)
},
...
...
src/librustc/traits/query/mod.rs
浏览文件 @
71ce2e7e
...
@@ -32,6 +32,9 @@
...
@@ -32,6 +32,9 @@
pub
type
CanonicalPredicateGoal
<
'tcx
>
=
pub
type
CanonicalPredicateGoal
<
'tcx
>
=
Canonical
<
'tcx
,
ty
::
ParamEnvAnd
<
'tcx
,
ty
::
Predicate
<
'tcx
>>>
;
Canonical
<
'tcx
,
ty
::
ParamEnvAnd
<
'tcx
,
ty
::
Predicate
<
'tcx
>>>
;
pub
type
CanonicalTypeOpEqGoal
<
'tcx
>
=
Canonical
<
'tcx
,
type_op
::
eq
::
Eq
<
'tcx
>>
;
#[derive(Copy,
Clone,
Debug,
PartialEq,
Eq,
Hash)]
#[derive(Copy,
Clone,
Debug,
PartialEq,
Eq,
Hash)]
pub
struct
NoSolution
;
pub
struct
NoSolution
;
...
...
src/librustc/traits/query/type_op/eq.rs
浏览文件 @
71ce2e7e
...
@@ -8,17 +8,14 @@
...
@@ -8,17 +8,14 @@
// 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
infer
::
canonical
::{
CanonicalizedQueryResult
,
Canonical
};
use
infer
::
canonical
::{
Canonical
,
CanonicalizedQueryResult
};
use
traits
::
query
::
NoSolution
;
use
traits
::{
FulfillmentContext
,
ObligationCause
};
use
ty
::{
self
,
ParamEnv
,
Ty
,
TyCtxt
};
use
ty
::{
self
,
ParamEnv
,
Ty
,
TyCtxt
};
use
syntax
::
codemap
::
DUMMY_SP
;
#[derive(Copy,
Clone,
Debug)]
#[derive(Copy,
Clone,
Debug
,
Hash,
PartialEq,
Eq
)]
pub
struct
Eq
<
'tcx
>
{
pub
struct
Eq
<
'tcx
>
{
param_env
:
ParamEnv
<
'tcx
>
,
p
ub
p
aram_env
:
ParamEnv
<
'tcx
>
,
a
:
Ty
<
'tcx
>
,
pub
a
:
Ty
<
'tcx
>
,
b
:
Ty
<
'tcx
>
,
pub
b
:
Ty
<
'tcx
>
,
}
}
impl
<
'tcx
>
Eq
<
'tcx
>
{
impl
<
'tcx
>
Eq
<
'tcx
>
{
...
@@ -46,20 +43,7 @@ fn perform_query(
...
@@ -46,20 +43,7 @@ fn perform_query(
tcx
:
TyCtxt
<
'_
,
'gcx
,
'tcx
>
,
tcx
:
TyCtxt
<
'_
,
'gcx
,
'tcx
>
,
canonicalized
:
Canonical
<
'gcx
,
Eq
<
'gcx
>>
,
canonicalized
:
Canonical
<
'gcx
,
Eq
<
'gcx
>>
,
)
->
CanonicalizedQueryResult
<
'gcx
,
()
>
{
)
->
CanonicalizedQueryResult
<
'gcx
,
()
>
{
let
tcx
=
tcx
.global_tcx
();
tcx
.type_op_eq
(
canonicalized
)
.unwrap
()
tcx
.infer_ctxt
()
.enter
(|
ref
infcx
|
{
let
(
Eq
{
param_env
,
a
,
b
},
canonical_inference_vars
)
=
infcx
.instantiate_canonical_with_fresh_inference_vars
(
DUMMY_SP
,
&
canonicalized
);
let
fulfill_cx
=
&
mut
FulfillmentContext
::
new
();
let
obligations
=
match
infcx
.at
(
&
ObligationCause
::
dummy
(),
param_env
)
.eq
(
a
,
b
)
{
Ok
(
v
)
=>
v
.into_obligations
(),
Err
(
_
)
=>
return
Err
(
NoSolution
),
};
fulfill_cx
.register_predicate_obligations
(
infcx
,
obligations
);
infcx
.make_canonicalized_query_result
(
canonical_inference_vars
,
(),
fulfill_cx
)
})
.unwrap
()
}
}
}
}
...
@@ -79,3 +63,7 @@ impl<'a, 'tcx> Lift<'tcx> for Eq<'a> {
...
@@ -79,3 +63,7 @@ impl<'a, 'tcx> Lift<'tcx> for Eq<'a> {
b
,
b
,
}
}
}
}
impl_stable_hash_for!
{
struct
Eq
<
'tcx
>
{
param_env
,
a
,
b
}
}
src/librustc/ty/query/config.rs
浏览文件 @
71ce2e7e
...
@@ -12,7 +12,9 @@
...
@@ -12,7 +12,9 @@
use
dep_graph
::
DepNode
;
use
dep_graph
::
DepNode
;
use
hir
::
def_id
::{
CrateNum
,
DefId
,
DefIndex
};
use
hir
::
def_id
::{
CrateNum
,
DefId
,
DefIndex
};
use
mir
::
interpret
::{
GlobalId
,
ConstValue
};
use
mir
::
interpret
::{
GlobalId
,
ConstValue
};
use
traits
::
query
::{
CanonicalPredicateGoal
,
CanonicalProjectionGoal
,
CanonicalTyGoal
};
use
traits
::
query
::{
CanonicalPredicateGoal
,
CanonicalProjectionGoal
,
CanonicalTyGoal
,
CanonicalTypeOpEqGoal
,
};
use
ty
::{
self
,
ParamEnvAnd
,
Ty
,
TyCtxt
};
use
ty
::{
self
,
ParamEnvAnd
,
Ty
,
TyCtxt
};
use
ty
::
subst
::
Substs
;
use
ty
::
subst
::
Substs
;
use
ty
::
query
::
queries
;
use
ty
::
query
::
queries
;
...
@@ -102,6 +104,12 @@ fn describe(_tcx: TyCtxt, goal: CanonicalPredicateGoal<'tcx>) -> String {
...
@@ -102,6 +104,12 @@ fn describe(_tcx: TyCtxt, goal: CanonicalPredicateGoal<'tcx>) -> String {
}
}
}
}
impl
<
'tcx
>
QueryDescription
<
'tcx
>
for
queries
::
type_op_eq
<
'tcx
>
{
fn
describe
(
_
tcx
:
TyCtxt
,
goal
:
CanonicalTypeOpEqGoal
<
'tcx
>
)
->
String
{
format!
(
"evaluating `type_op_eq` `{:?}`"
,
goal
)
}
}
impl
<
'tcx
>
QueryDescription
<
'tcx
>
for
queries
::
is_copy_raw
<
'tcx
>
{
impl
<
'tcx
>
QueryDescription
<
'tcx
>
for
queries
::
is_copy_raw
<
'tcx
>
{
fn
describe
(
_
tcx
:
TyCtxt
,
env
:
ty
::
ParamEnvAnd
<
'tcx
,
Ty
<
'tcx
>>
)
->
String
{
fn
describe
(
_
tcx
:
TyCtxt
,
env
:
ty
::
ParamEnvAnd
<
'tcx
,
Ty
<
'tcx
>>
)
->
String
{
format!
(
"computing whether `{}` is `Copy`"
,
env
.value
)
format!
(
"computing whether `{}` is `Copy`"
,
env
.value
)
...
...
src/librustc/ty/query/keys.rs
浏览文件 @
71ce2e7e
...
@@ -10,8 +10,8 @@
...
@@ -10,8 +10,8 @@
//! Defines the set of legal keys that can be used in queries.
//! Defines the set of legal keys that can be used in queries.
use
infer
::
canonical
::
Canonical
;
use
hir
::
def_id
::{
CrateNum
,
DefId
,
LOCAL_CRATE
,
DefIndex
};
use
hir
::
def_id
::{
CrateNum
,
DefId
,
LOCAL_CRATE
,
DefIndex
};
use
traits
::
query
::{
CanonicalPredicateGoal
,
CanonicalProjectionGoal
,
CanonicalTyGoal
};
use
ty
::{
self
,
Ty
,
TyCtxt
};
use
ty
::{
self
,
Ty
,
TyCtxt
};
use
ty
::
subst
::
Substs
;
use
ty
::
subst
::
Substs
;
use
ty
::
fast_reject
::
SimplifiedType
;
use
ty
::
fast_reject
::
SimplifiedType
;
...
@@ -190,27 +190,12 @@ fn default_span(&self, _tcx: TyCtxt) -> Span {
...
@@ -190,27 +190,12 @@ fn default_span(&self, _tcx: TyCtxt) -> Span {
}
}
}
}
impl
<
'tcx
>
Key
for
CanonicalProjectionGoal
<
'tcx
>
{
/// Canonical query goals correspond to abstract trait operations that
fn
query_crate
(
&
self
)
->
CrateNum
{
/// are not tied to any crate in particular.
LOCAL_CRATE
impl
<
'tcx
,
T
>
Key
for
Canonical
<
'tcx
,
T
>
}
where
T
:
Debug
+
Hash
+
Clone
+
Eq
,
fn
default_span
(
&
self
,
_
tcx
:
TyCtxt
)
->
Span
{
{
DUMMY_SP
}
}
impl
<
'tcx
>
Key
for
CanonicalTyGoal
<
'tcx
>
{
fn
query_crate
(
&
self
)
->
CrateNum
{
LOCAL_CRATE
}
fn
default_span
(
&
self
,
_
tcx
:
TyCtxt
)
->
Span
{
DUMMY_SP
}
}
impl
<
'tcx
>
Key
for
CanonicalPredicateGoal
<
'tcx
>
{
fn
query_crate
(
&
self
)
->
CrateNum
{
fn
query_crate
(
&
self
)
->
CrateNum
{
LOCAL_CRATE
LOCAL_CRATE
}
}
...
...
src/librustc/ty/query/mod.rs
浏览文件 @
71ce2e7e
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
use
session
::
config
::
OutputFilenames
;
use
session
::
config
::
OutputFilenames
;
use
traits
::{
self
,
Vtable
};
use
traits
::{
self
,
Vtable
};
use
traits
::
query
::{
CanonicalPredicateGoal
,
CanonicalProjectionGoal
,
use
traits
::
query
::{
CanonicalPredicateGoal
,
CanonicalProjectionGoal
,
CanonicalTyGoal
,
NoSolution
};
CanonicalTyGoal
,
CanonicalTypeOpEqGoal
,
NoSolution
};
use
traits
::
query
::
dropck_outlives
::{
DtorckConstraint
,
DropckOutlivesResult
};
use
traits
::
query
::
dropck_outlives
::{
DtorckConstraint
,
DropckOutlivesResult
};
use
traits
::
query
::
normalize
::
NormalizationResult
;
use
traits
::
query
::
normalize
::
NormalizationResult
;
use
traits
::
specialization_graph
;
use
traits
::
specialization_graph
;
...
@@ -446,6 +446,14 @@
...
@@ -446,6 +446,14 @@
CanonicalPredicateGoal
<
'tcx
>
CanonicalPredicateGoal
<
'tcx
>
)
->
Result
<
traits
::
EvaluationResult
,
traits
::
OverflowError
>
,
)
->
Result
<
traits
::
EvaluationResult
,
traits
::
OverflowError
>
,
/// Do not call this query directly: invoke `infcx.eq()` instead.
[]
fn
type_op_eq
:
TypeOpEq
(
CanonicalTypeOpEqGoal
<
'tcx
>
)
->
Result
<
Lrc
<
Canonical
<
'tcx
,
canonical
::
QueryResult
<
'tcx
,
()
>>>
,
NoSolution
,
>
,
[]
fn
substitute_normalize_and_test_predicates
:
[]
fn
substitute_normalize_and_test_predicates
:
substitute_normalize_and_test_predicates_node
((
DefId
,
&
'tcx
Substs
<
'tcx
>
))
->
bool
,
substitute_normalize_and_test_predicates_node
((
DefId
,
&
'tcx
Substs
<
'tcx
>
))
->
bool
,
...
...
src/librustc/ty/query/plumbing.rs
浏览文件 @
71ce2e7e
...
@@ -1028,6 +1028,7 @@ pub fn force_from_dep_node<'a, 'gcx, 'lcx>(tcx: TyCtxt<'a, 'gcx, 'lcx>,
...
@@ -1028,6 +1028,7 @@ pub fn force_from_dep_node<'a, 'gcx, 'lcx>(tcx: TyCtxt<'a, 'gcx, 'lcx>,
DepKind
::
NormalizeTyAfterErasingRegions
|
DepKind
::
NormalizeTyAfterErasingRegions
|
DepKind
::
DropckOutlives
|
DepKind
::
DropckOutlives
|
DepKind
::
EvaluateObligation
|
DepKind
::
EvaluateObligation
|
DepKind
::
TypeOpEq
|
DepKind
::
SubstituteNormalizeAndTestPredicates
|
DepKind
::
SubstituteNormalizeAndTestPredicates
|
DepKind
::
InstanceDefSizeEstimate
|
DepKind
::
InstanceDefSizeEstimate
|
DepKind
::
ProgramClausesForEnv
|
DepKind
::
ProgramClausesForEnv
|
...
...
src/librustc_traits/lib.rs
浏览文件 @
71ce2e7e
...
@@ -34,6 +34,7 @@
...
@@ -34,6 +34,7 @@
mod
normalize_projection_ty
;
mod
normalize_projection_ty
;
mod
normalize_erasing_regions
;
mod
normalize_erasing_regions
;
pub
mod
lowering
;
pub
mod
lowering
;
mod
type_op_eq
;
use
rustc
::
ty
::
query
::
Providers
;
use
rustc
::
ty
::
query
::
Providers
;
...
@@ -47,6 +48,7 @@ pub fn provide(p: &mut Providers) {
...
@@ -47,6 +48,7 @@ pub fn provide(p: &mut Providers) {
program_clauses_for
:
lowering
::
program_clauses_for
,
program_clauses_for
:
lowering
::
program_clauses_for
,
program_clauses_for_env
:
lowering
::
program_clauses_for_env
,
program_clauses_for_env
:
lowering
::
program_clauses_for_env
,
evaluate_obligation
:
evaluate_obligation
::
evaluate_obligation
,
evaluate_obligation
:
evaluate_obligation
::
evaluate_obligation
,
type_op_eq
:
type_op_eq
::
type_op_eq
,
..*
p
..*
p
};
};
}
}
src/librustc_traits/type_op_eq.rs
0 → 100644
浏览文件 @
71ce2e7e
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use
rustc
::
infer
::
canonical
::{
Canonical
,
QueryResult
};
use
rustc
::
traits
::
query
::
type_op
::
eq
::
Eq
;
use
rustc
::
traits
::
query
::
NoSolution
;
use
rustc
::
traits
::{
FulfillmentContext
,
ObligationCause
};
use
rustc
::
ty
::
TyCtxt
;
use
rustc_data_structures
::
sync
::
Lrc
;
use
syntax
::
codemap
::
DUMMY_SP
;
crate
fn
type_op_eq
<
'tcx
>
(
tcx
:
TyCtxt
<
'_
,
'tcx
,
'tcx
>
,
canonicalized
:
Canonical
<
'tcx
,
Eq
<
'tcx
>>
,
)
->
Result
<
Lrc
<
Canonical
<
'tcx
,
QueryResult
<
'tcx
,
()
>>>
,
NoSolution
>
{
let
tcx
=
tcx
.global_tcx
();
tcx
.infer_ctxt
()
.enter
(|
ref
infcx
|
{
let
(
Eq
{
param_env
,
a
,
b
},
canonical_inference_vars
)
=
infcx
.instantiate_canonical_with_fresh_inference_vars
(
DUMMY_SP
,
&
canonicalized
);
let
fulfill_cx
=
&
mut
FulfillmentContext
::
new
();
let
obligations
=
match
infcx
.at
(
&
ObligationCause
::
dummy
(),
param_env
)
.eq
(
a
,
b
)
{
Ok
(
v
)
=>
v
.into_obligations
(),
Err
(
_
)
=>
return
Err
(
NoSolution
),
};
fulfill_cx
.register_predicate_obligations
(
infcx
,
obligations
);
infcx
.make_canonicalized_query_result
(
canonical_inference_vars
,
(),
fulfill_cx
)
})
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录