aboutsummaryrefslogtreecommitdiff
path: root/crates/hir_ty/src
diff options
context:
space:
mode:
Diffstat (limited to 'crates/hir_ty/src')
-rw-r--r--crates/hir_ty/src/display.rs28
-rw-r--r--crates/hir_ty/src/infer/expr.rs11
-rw-r--r--crates/hir_ty/src/lib.rs39
-rw-r--r--crates/hir_ty/src/tests/simple.rs45
-rw-r--r--crates/hir_ty/src/tests/traits.rs40
-rw-r--r--crates/hir_ty/src/traits/chalk.rs103
-rw-r--r--crates/hir_ty/src/traits/chalk/tls.rs3
7 files changed, 216 insertions, 53 deletions
diff --git a/crates/hir_ty/src/display.rs b/crates/hir_ty/src/display.rs
index 64b68014d..efb48c7ee 100644
--- a/crates/hir_ty/src/display.rs
+++ b/crates/hir_ty/src/display.rs
@@ -381,19 +381,24 @@ impl HirDisplay for ApplicationTy {
381 } 381 }
382 } 382 }
383 TypeCtor::OpaqueType(opaque_ty_id) => { 383 TypeCtor::OpaqueType(opaque_ty_id) => {
384 let bounds = match opaque_ty_id { 384 match opaque_ty_id {
385 OpaqueTyId::ReturnTypeImplTrait(func, idx) => { 385 OpaqueTyId::ReturnTypeImplTrait(func, idx) => {
386 let datas = 386 let datas =
387 f.db.return_type_impl_traits(func).expect("impl trait id without data"); 387 f.db.return_type_impl_traits(func).expect("impl trait id without data");
388 let data = (*datas) 388 let data = (*datas)
389 .as_ref() 389 .as_ref()
390 .map(|rpit| rpit.impl_traits[idx as usize].bounds.clone()); 390 .map(|rpit| rpit.impl_traits[idx as usize].bounds.clone());
391 data.subst(&self.parameters) 391 let bounds = data.subst(&self.parameters);
392 write!(f, "impl ")?;
393 write_bounds_like_dyn_trait(&bounds.value, f)?;
394 // FIXME: it would maybe be good to distinguish this from the alias type (when debug printing), and to show the substitution
392 } 395 }
393 }; 396 OpaqueTyId::AsyncBlockTypeImplTrait(..) => {
394 write!(f, "impl ")?; 397 write!(f, "impl Future<Output = ")?;
395 write_bounds_like_dyn_trait(&bounds.value, f)?; 398 self.parameters[0].hir_fmt(f)?;
396 // FIXME: it would maybe be good to distinguish this from the alias type (when debug printing), and to show the substitution 399 write!(f, ">")?;
400 }
401 }
397 } 402 }
398 TypeCtor::Closure { .. } => { 403 TypeCtor::Closure { .. } => {
399 let sig = self.parameters[0].callable_sig(f.db); 404 let sig = self.parameters[0].callable_sig(f.db);
@@ -474,18 +479,21 @@ impl HirDisplay for Ty {
474 write_bounds_like_dyn_trait(predicates, f)?; 479 write_bounds_like_dyn_trait(predicates, f)?;
475 } 480 }
476 Ty::Opaque(opaque_ty) => { 481 Ty::Opaque(opaque_ty) => {
477 let bounds = match opaque_ty.opaque_ty_id { 482 match opaque_ty.opaque_ty_id {
478 OpaqueTyId::ReturnTypeImplTrait(func, idx) => { 483 OpaqueTyId::ReturnTypeImplTrait(func, idx) => {
479 let datas = 484 let datas =
480 f.db.return_type_impl_traits(func).expect("impl trait id without data"); 485 f.db.return_type_impl_traits(func).expect("impl trait id without data");
481 let data = (*datas) 486 let data = (*datas)
482 .as_ref() 487 .as_ref()
483 .map(|rpit| rpit.impl_traits[idx as usize].bounds.clone()); 488 .map(|rpit| rpit.impl_traits[idx as usize].bounds.clone());
484 data.subst(&opaque_ty.parameters) 489 let bounds = data.subst(&opaque_ty.parameters);
490 write!(f, "impl ")?;
491 write_bounds_like_dyn_trait(&bounds.value, f)?;
492 }
493 OpaqueTyId::AsyncBlockTypeImplTrait(..) => {
494 write!(f, "{{async block}}")?;
485 } 495 }
486 }; 496 };
487 write!(f, "impl ")?;
488 write_bounds_like_dyn_trait(&bounds.value, f)?;
489 } 497 }
490 Ty::Unknown => write!(f, "{{unknown}}")?, 498 Ty::Unknown => write!(f, "{{unknown}}")?,
491 Ty::Infer(..) => write!(f, "_")?, 499 Ty::Infer(..) => write!(f, "_")?,
diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs
index a2f849d02..0a141b9cb 100644
--- a/crates/hir_ty/src/infer/expr.rs
+++ b/crates/hir_ty/src/infer/expr.rs
@@ -17,8 +17,8 @@ use crate::{
17 autoderef, method_resolution, op, 17 autoderef, method_resolution, op,
18 traits::{FnTrait, InEnvironment}, 18 traits::{FnTrait, InEnvironment},
19 utils::{generics, variant_data, Generics}, 19 utils::{generics, variant_data, Generics},
20 ApplicationTy, Binders, CallableDefId, InferTy, IntTy, Mutability, Obligation, Rawness, Substs, 20 ApplicationTy, Binders, CallableDefId, InferTy, IntTy, Mutability, Obligation, OpaqueTyId,
21 TraitRef, Ty, TypeCtor, 21 Rawness, Substs, TraitRef, Ty, TypeCtor,
22}; 22};
23 23
24use super::{ 24use super::{
@@ -146,6 +146,13 @@ impl<'a> InferenceContext<'a> {
146 // FIXME should be std::result::Result<{inner}, _> 146 // FIXME should be std::result::Result<{inner}, _>
147 Ty::Unknown 147 Ty::Unknown
148 } 148 }
149 Expr::Async { body } => {
150 // Use the first type parameter as the output type of future.
151 // existenail type AsyncBlockImplTrait<InnerType>: Future<Output = InnerType>
152 let inner_ty = self.infer_expr(*body, &Expectation::none());
153 let opaque_ty_id = OpaqueTyId::AsyncBlockTypeImplTrait(self.owner, *body);
154 Ty::apply_one(TypeCtor::OpaqueType(opaque_ty_id), inner_ty)
155 }
149 Expr::Loop { body, label } => { 156 Expr::Loop { body, label } => {
150 self.breakables.push(BreakableContext { 157 self.breakables.push(BreakableContext {
151 may_break: false, 158 may_break: false,
diff --git a/crates/hir_ty/src/lib.rs b/crates/hir_ty/src/lib.rs
index 1e748476a..4a7d3a0d9 100644
--- a/crates/hir_ty/src/lib.rs
+++ b/crates/hir_ty/src/lib.rs
@@ -33,6 +33,7 @@ use hir_def::{
33 AdtId, AssocContainerId, DefWithBodyId, GenericDefId, HasModule, Lookup, TraitId, TypeAliasId, 33 AdtId, AssocContainerId, DefWithBodyId, GenericDefId, HasModule, Lookup, TraitId, TypeAliasId,
34 TypeParamId, 34 TypeParamId,
35}; 35};
36use hir_expand::name::name;
36use itertools::Itertools; 37use itertools::Itertools;
37 38
38use crate::{ 39use crate::{
@@ -129,8 +130,9 @@ pub enum TypeCtor {
129 130
130 /// This represents a placeholder for an opaque type in situations where we 131 /// This represents a placeholder for an opaque type in situations where we
131 /// don't know the hidden type (i.e. currently almost always). This is 132 /// don't know the hidden type (i.e. currently almost always). This is
132 /// analogous to the `AssociatedType` type constructor. As with that one, 133 /// analogous to the `AssociatedType` type constructor.
133 /// these are only produced by Chalk. 134 /// It is also used as the type of async block, with one type parameter
135 /// representing the Future::Output type.
134 OpaqueType(OpaqueTyId), 136 OpaqueType(OpaqueTyId),
135 137
136 /// The type of a specific closure. 138 /// The type of a specific closure.
@@ -173,6 +175,8 @@ impl TypeCtor {
173 let generic_params = generics(db.upcast(), func.into()); 175 let generic_params = generics(db.upcast(), func.into());
174 generic_params.len() 176 generic_params.len()
175 } 177 }
178 // 1 param representing Future::Output type.
179 OpaqueTyId::AsyncBlockTypeImplTrait(..) => 1,
176 } 180 }
177 } 181 }
178 TypeCtor::FnPtr { num_args, is_varargs: _ } => num_args as usize + 1, 182 TypeCtor::FnPtr { num_args, is_varargs: _ } => num_args as usize + 1,
@@ -205,6 +209,7 @@ impl TypeCtor {
205 OpaqueTyId::ReturnTypeImplTrait(func, _) => { 209 OpaqueTyId::ReturnTypeImplTrait(func, _) => {
206 Some(func.lookup(db.upcast()).module(db.upcast()).krate) 210 Some(func.lookup(db.upcast()).module(db.upcast()).krate)
207 } 211 }
212 OpaqueTyId::AsyncBlockTypeImplTrait(def, _) => Some(def.module(db.upcast()).krate),
208 }, 213 },
209 } 214 }
210 } 215 }
@@ -843,6 +848,33 @@ impl Ty {
843 848
844 pub fn impl_trait_bounds(&self, db: &dyn HirDatabase) -> Option<Vec<GenericPredicate>> { 849 pub fn impl_trait_bounds(&self, db: &dyn HirDatabase) -> Option<Vec<GenericPredicate>> {
845 match self { 850 match self {
851 Ty::Apply(ApplicationTy { ctor: TypeCtor::OpaqueType(opaque_ty_id), parameters }) => {
852 match opaque_ty_id {
853 OpaqueTyId::AsyncBlockTypeImplTrait(def, _expr) => {
854 let krate = def.module(db.upcast()).krate;
855 if let Some(future_output) = db
856 .lang_item(krate, "future_trait".into())
857 .and_then(|item| item.as_trait())
858 .and_then(|trait_| {
859 db.trait_data(trait_).associated_type_by_name(&name![Output])
860 })
861 {
862 let proj = GenericPredicate::Projection(ProjectionPredicate {
863 projection_ty: ProjectionTy {
864 associated_ty: future_output,
865 // Self type.
866 parameters: Substs::single(self.clone()),
867 },
868 ty: parameters[0].clone(),
869 });
870 Some(vec![proj])
871 } else {
872 None
873 }
874 }
875 OpaqueTyId::ReturnTypeImplTrait(..) => None,
876 }
877 }
846 Ty::Opaque(opaque_ty) => { 878 Ty::Opaque(opaque_ty) => {
847 let predicates = match opaque_ty.opaque_ty_id { 879 let predicates = match opaque_ty.opaque_ty_id {
848 OpaqueTyId::ReturnTypeImplTrait(func, idx) => { 880 OpaqueTyId::ReturnTypeImplTrait(func, idx) => {
@@ -853,6 +885,8 @@ impl Ty {
853 data.subst(&opaque_ty.parameters) 885 data.subst(&opaque_ty.parameters)
854 }) 886 })
855 } 887 }
888 // It always has an parameter for Future::Output type.
889 OpaqueTyId::AsyncBlockTypeImplTrait(..) => unreachable!(),
856 }; 890 };
857 891
858 predicates.map(|it| it.value) 892 predicates.map(|it| it.value)
@@ -1065,6 +1099,7 @@ impl<T: TypeWalk> TypeWalk for Vec<T> {
1065#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)] 1099#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)]
1066pub enum OpaqueTyId { 1100pub enum OpaqueTyId {
1067 ReturnTypeImplTrait(hir_def::FunctionId, u16), 1101 ReturnTypeImplTrait(hir_def::FunctionId, u16),
1102 AsyncBlockTypeImplTrait(hir_def::DefWithBodyId, ExprId),
1068} 1103}
1069 1104
1070#[derive(Clone, PartialEq, Eq, Debug, Hash)] 1105#[derive(Clone, PartialEq, Eq, Debug, Hash)]
diff --git a/crates/hir_ty/src/tests/simple.rs b/crates/hir_ty/src/tests/simple.rs
index 48db23a34..5b07948f3 100644
--- a/crates/hir_ty/src/tests/simple.rs
+++ b/crates/hir_ty/src/tests/simple.rs
@@ -1889,31 +1889,40 @@ fn fn_pointer_return() {
1889fn effects_smoke_test() { 1889fn effects_smoke_test() {
1890 check_infer( 1890 check_infer(
1891 r#" 1891 r#"
1892 fn main() { 1892 async fn main() {
1893 let x = unsafe { 92 }; 1893 let x = unsafe { 92 };
1894 let y = async { async { () }.await }; 1894 let y = async { async { () }.await };
1895 let z = try { () }; 1895 let z = try { () };
1896 let t = 'a: { 92 }; 1896 let t = 'a: { 92 };
1897 } 1897 }
1898
1899 #[prelude_import] use future::*;
1900
1901 mod future {
1902 #[lang = "future_trait"]
1903 pub trait Future { type Output; }
1904 }
1898 "#, 1905 "#,
1899 expect![[r#" 1906 expect![[r#"
1900 10..130 '{ ...2 }; }': () 1907 16..136 '{ ...2 }; }': ()
1901 20..21 'x': i32 1908 26..27 'x': i32
1902 24..37 'unsafe { 92 }': i32 1909 30..43 'unsafe { 92 }': i32
1903 31..37 '{ 92 }': i32 1910 37..43 '{ 92 }': i32
1904 33..35 '92': i32 1911 39..41 '92': i32
1905 47..48 'y': {unknown} 1912 53..54 'y': impl Future<Output = ()>
1906 57..79 '{ asyn...wait }': {unknown} 1913 57..85 'async ...wait }': impl Future<Output = ()>
1907 59..77 'async ....await': {unknown} 1914 63..85 '{ asyn...wait }': ()
1908 65..71 '{ () }': () 1915 65..77 'async { () }': impl Future<Output = ()>
1909 67..69 '()': () 1916 65..83 'async ....await': ()
1910 89..90 'z': {unknown} 1917 71..77 '{ () }': ()
1911 93..103 'try { () }': {unknown} 1918 73..75 '()': ()
1912 97..103 '{ () }': () 1919 95..96 'z': {unknown}
1913 99..101 '()': () 1920 99..109 'try { () }': {unknown}
1914 113..114 't': i32 1921 103..109 '{ () }': ()
1915 121..127 '{ 92 }': i32 1922 105..107 '()': ()
1916 123..125 '92': i32 1923 119..120 't': i32
1924 127..133 '{ 92 }': i32
1925 129..131 '92': i32
1917 "#]], 1926 "#]],
1918 ) 1927 )
1919} 1928}
diff --git a/crates/hir_ty/src/tests/traits.rs b/crates/hir_ty/src/tests/traits.rs
index 1f1056962..41d097519 100644
--- a/crates/hir_ty/src/tests/traits.rs
+++ b/crates/hir_ty/src/tests/traits.rs
@@ -86,6 +86,46 @@ mod future {
86} 86}
87 87
88#[test] 88#[test]
89fn infer_async_block() {
90 check_types(
91 r#"
92//- /main.rs crate:main deps:core
93async fn test() {
94 let a = async { 42 };
95 a;
96// ^ impl Future<Output = i32>
97 let x = a.await;
98 x;
99// ^ i32
100 let b = async {}.await;
101 b;
102// ^ ()
103 let c = async {
104 let y = Option::None;
105 y
106 // ^ Option<u64>
107 };
108 let _: Option<u64> = c.await;
109 c;
110// ^ impl Future<Output = Option<u64>>
111}
112
113enum Option<T> { None, Some(T) }
114
115//- /core.rs crate:core
116#[prelude_import] use future::*;
117mod future {
118 #[lang = "future_trait"]
119 trait Future {
120 type Output;
121 }
122}
123
124"#,
125 );
126}
127
128#[test]
89fn infer_try() { 129fn infer_try() {
90 check_types( 130 check_types(
91 r#" 131 r#"
diff --git a/crates/hir_ty/src/traits/chalk.rs b/crates/hir_ty/src/traits/chalk.rs
index 17c83b6a4..25e8ac186 100644
--- a/crates/hir_ty/src/traits/chalk.rs
+++ b/crates/hir_ty/src/traits/chalk.rs
@@ -11,6 +11,7 @@ use hir_def::{
11 lang_item::{lang_attr, LangItemTarget}, 11 lang_item::{lang_attr, LangItemTarget},
12 AssocContainerId, AssocItemId, HasModule, Lookup, TypeAliasId, 12 AssocContainerId, AssocItemId, HasModule, Lookup, TypeAliasId,
13}; 13};
14use hir_expand::name::name;
14 15
15use super::ChalkContext; 16use super::ChalkContext;
16use crate::{ 17use crate::{
@@ -18,7 +19,8 @@ use crate::{
18 display::HirDisplay, 19 display::HirDisplay,
19 method_resolution::{TyFingerprint, ALL_FLOAT_FPS, ALL_INT_FPS}, 20 method_resolution::{TyFingerprint, ALL_FLOAT_FPS, ALL_INT_FPS},
20 utils::generics, 21 utils::generics,
21 CallableDefId, DebruijnIndex, FnSig, GenericPredicate, Substs, Ty, TypeCtor, 22 BoundVar, CallableDefId, DebruijnIndex, FnSig, GenericPredicate, ProjectionPredicate,
23 ProjectionTy, Substs, TraitRef, Ty, TypeCtor,
22}; 24};
23use mapping::{ 25use mapping::{
24 convert_where_clauses, generic_predicate_to_inline_bound, make_binders, TypeAliasAsValue, 26 convert_where_clauses, generic_predicate_to_inline_bound, make_binders, TypeAliasAsValue,
@@ -166,27 +168,86 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> {
166 fn opaque_ty_data(&self, id: chalk_ir::OpaqueTyId<Interner>) -> Arc<OpaqueTyDatum> { 168 fn opaque_ty_data(&self, id: chalk_ir::OpaqueTyId<Interner>) -> Arc<OpaqueTyDatum> {
167 let interned_id = crate::db::InternedOpaqueTyId::from(id); 169 let interned_id = crate::db::InternedOpaqueTyId::from(id);
168 let full_id = self.db.lookup_intern_impl_trait_id(interned_id); 170 let full_id = self.db.lookup_intern_impl_trait_id(interned_id);
169 let (func, idx) = match full_id { 171 let bound = match full_id {
170 crate::OpaqueTyId::ReturnTypeImplTrait(func, idx) => (func, idx), 172 crate::OpaqueTyId::ReturnTypeImplTrait(func, idx) => {
171 }; 173 let datas = self
172 let datas = 174 .db
173 self.db.return_type_impl_traits(func).expect("impl trait id without impl traits"); 175 .return_type_impl_traits(func)
174 let data = &datas.value.impl_traits[idx as usize]; 176 .expect("impl trait id without impl traits");
175 let bound = OpaqueTyDatumBound { 177 let data = &datas.value.impl_traits[idx as usize];
176 bounds: make_binders( 178 let bound = OpaqueTyDatumBound {
177 data.bounds 179 bounds: make_binders(
178 .value 180 data.bounds
179 .iter() 181 .value
180 .cloned() 182 .iter()
181 .filter(|b| !b.is_error()) 183 .cloned()
182 .map(|b| b.to_chalk(self.db)) 184 .filter(|b| !b.is_error())
183 .collect(), 185 .map(|b| b.to_chalk(self.db))
184 1, 186 .collect(),
185 ), 187 1,
186 where_clauses: make_binders(vec![], 0), 188 ),
189 where_clauses: make_binders(vec![], 0),
190 };
191 let num_vars = datas.num_binders;
192 make_binders(bound, num_vars)
193 }
194 crate::OpaqueTyId::AsyncBlockTypeImplTrait(..) => {
195 if let Some((future_trait, future_output)) = self
196 .db
197 .lang_item(self.krate, "future_trait".into())
198 .and_then(|item| item.as_trait())
199 .and_then(|trait_| {
200 let alias =
201 self.db.trait_data(trait_).associated_type_by_name(&name![Output])?;
202 Some((trait_, alias))
203 })
204 {
205 // AsyncBlock<T>: Future</* Self */>
206 // This is required by `fn impls_future` to check if we need to provide `.await` completion.
207 let impl_bound = GenericPredicate::Implemented(TraitRef {
208 trait_: future_trait,
209 // Self type as the first parameter.
210 substs: Substs::single(Ty::Bound(BoundVar {
211 debruijn: DebruijnIndex::INNERMOST,
212 index: 0,
213 })),
214 });
215 // AsyncBlock<T>: Future</* Self, */ Output = T>;
216 // debruijn: ^1 ^0
217 let proj_bound = GenericPredicate::Projection(ProjectionPredicate {
218 // The parameter of the opaque type.
219 ty: Ty::Bound(BoundVar { debruijn: DebruijnIndex::ONE, index: 0 }),
220 projection_ty: ProjectionTy {
221 associated_ty: future_output,
222 // Self type as the first parameter.
223 parameters: Substs::single(Ty::Bound(BoundVar::new(
224 DebruijnIndex::INNERMOST,
225 0,
226 ))),
227 },
228 });
229 let bound = OpaqueTyDatumBound {
230 bounds: make_binders(
231 vec![impl_bound.to_chalk(self.db), proj_bound.to_chalk(self.db)],
232 1,
233 ),
234 where_clauses: make_binders(vec![], 0),
235 };
236 // The opaque type has 1 parameter.
237 make_binders(bound, 1)
238 } else {
239 // If failed to find `Future::Output`, return empty bounds as fallback.
240 let bound = OpaqueTyDatumBound {
241 bounds: make_binders(vec![], 0),
242 where_clauses: make_binders(vec![], 0),
243 };
244 // The opaque type has 1 parameter.
245 make_binders(bound, 1)
246 }
247 }
187 }; 248 };
188 let num_vars = datas.num_binders; 249
189 Arc::new(OpaqueTyDatum { opaque_ty_id: id, bound: make_binders(bound, num_vars) }) 250 Arc::new(OpaqueTyDatum { opaque_ty_id: id, bound })
190 } 251 }
191 252
192 fn hidden_opaque_type(&self, _id: chalk_ir::OpaqueTyId<Interner>) -> chalk_ir::Ty<Interner> { 253 fn hidden_opaque_type(&self, _id: chalk_ir::OpaqueTyId<Interner>) -> chalk_ir::Ty<Interner> {
diff --git a/crates/hir_ty/src/traits/chalk/tls.rs b/crates/hir_ty/src/traits/chalk/tls.rs
index db915625c..cb6b0fe81 100644
--- a/crates/hir_ty/src/traits/chalk/tls.rs
+++ b/crates/hir_ty/src/traits/chalk/tls.rs
@@ -73,6 +73,9 @@ impl DebugContext<'_> {
73 crate::OpaqueTyId::ReturnTypeImplTrait(func, idx) => { 73 crate::OpaqueTyId::ReturnTypeImplTrait(func, idx) => {
74 write!(f, "{{impl trait {} of {:?}}}", idx, func)?; 74 write!(f, "{{impl trait {} of {:?}}}", idx, func)?;
75 } 75 }
76 crate::OpaqueTyId::AsyncBlockTypeImplTrait(def, idx) => {
77 write!(f, "{{impl trait of async block {} of {:?}}}", idx.into_raw(), def)?;
78 }
76 }, 79 },
77 TypeCtor::Closure { def, expr } => { 80 TypeCtor::Closure { def, expr } => {
78 write!(f, "{{closure {:?} in ", expr.into_raw())?; 81 write!(f, "{{closure {:?} in ", expr.into_raw())?;