aboutsummaryrefslogtreecommitdiff
path: root/crates/hir_def/src
diff options
context:
space:
mode:
Diffstat (limited to 'crates/hir_def/src')
-rw-r--r--crates/hir_def/src/generics.rs69
-rw-r--r--crates/hir_def/src/item_tree.rs2
-rw-r--r--crates/hir_def/src/item_tree/lower.rs20
-rw-r--r--crates/hir_def/src/lib.rs7
-rw-r--r--crates/hir_def/src/path.rs4
-rw-r--r--crates/hir_def/src/path/lower.rs12
-rw-r--r--crates/hir_def/src/type_ref.rs50
7 files changed, 118 insertions, 46 deletions
diff --git a/crates/hir_def/src/generics.rs b/crates/hir_def/src/generics.rs
index 835fe3fbd..5189c7e9f 100644
--- a/crates/hir_def/src/generics.rs
+++ b/crates/hir_def/src/generics.rs
@@ -21,7 +21,7 @@ use crate::{
21 keys, 21 keys,
22 src::HasChildSource, 22 src::HasChildSource,
23 src::HasSource, 23 src::HasSource,
24 type_ref::{TypeBound, TypeRef}, 24 type_ref::{LifetimeRef, TypeBound, TypeRef},
25 AdtId, GenericDefId, LocalTypeParamId, Lookup, TypeParamId, 25 AdtId, GenericDefId, LocalTypeParamId, Lookup, TypeParamId,
26}; 26};
27 27
@@ -33,6 +33,12 @@ pub struct TypeParamData {
33 pub provenance: TypeParamProvenance, 33 pub provenance: TypeParamProvenance,
34} 34}
35 35
36/// Data about a generic parameter (to a function, struct, impl, ...).
37#[derive(Clone, PartialEq, Eq, Debug)]
38pub struct LifetimeParamData {
39 pub name: Name,
40}
41
36#[derive(Copy, Clone, PartialEq, Eq, Debug)] 42#[derive(Copy, Clone, PartialEq, Eq, Debug)]
37pub enum TypeParamProvenance { 43pub enum TypeParamProvenance {
38 TypeParamList, 44 TypeParamList,
@@ -44,7 +50,7 @@ pub enum TypeParamProvenance {
44#[derive(Clone, PartialEq, Eq, Debug, Default)] 50#[derive(Clone, PartialEq, Eq, Debug, Default)]
45pub struct GenericParams { 51pub struct GenericParams {
46 pub types: Arena<TypeParamData>, 52 pub types: Arena<TypeParamData>,
47 // lifetimes: Arena<LocalLifetimeParamId, LifetimeParamData>, 53 pub lifetimes: Arena<LifetimeParamData>,
48 pub where_predicates: Vec<WherePredicate>, 54 pub where_predicates: Vec<WherePredicate>,
49} 55}
50 56
@@ -53,16 +59,17 @@ pub struct GenericParams {
53/// It might still result in multiple actual predicates though, because of 59/// It might still result in multiple actual predicates though, because of
54/// associated type bindings like `Iterator<Item = u32>`. 60/// associated type bindings like `Iterator<Item = u32>`.
55#[derive(Clone, PartialEq, Eq, Debug)] 61#[derive(Clone, PartialEq, Eq, Debug)]
56pub struct WherePredicate { 62pub enum WherePredicate {
57 pub target: WherePredicateTarget, 63 TypeBound { target: WherePredicateTypeTarget, bound: TypeBound },
58 pub bound: TypeBound, 64 Lifetime { target: LifetimeRef, bound: LifetimeRef },
59} 65}
60 66
61#[derive(Clone, PartialEq, Eq, Debug)] 67#[derive(Clone, PartialEq, Eq, Debug)]
62pub enum WherePredicateTarget { 68pub enum WherePredicateTypeTarget {
63 TypeRef(TypeRef), 69 TypeRef(TypeRef),
64 /// For desugared where predicates that can directly refer to a type param. 70 /// For desugared where predicates that can directly refer to a type param.
65 TypeParam(LocalTypeParamId), 71 TypeParam(LocalTypeParamId),
72 // FIXME: ForLifetime(Vec<LifetimeParamId>, TypeRef)
66} 73}
67 74
68type SourceMap = ArenaMap<LocalTypeParamId, Either<ast::Trait, ast::TypeParam>>; 75type SourceMap = ArenaMap<LocalTypeParamId, Either<ast::Trait, ast::TypeParam>>;
@@ -123,7 +130,7 @@ impl GenericParams {
123 } 130 }
124 131
125 fn new(db: &dyn DefDatabase, def: GenericDefId) -> (GenericParams, InFile<SourceMap>) { 132 fn new(db: &dyn DefDatabase, def: GenericDefId) -> (GenericParams, InFile<SourceMap>) {
126 let mut generics = GenericParams { types: Arena::default(), where_predicates: Vec::new() }; 133 let mut generics = GenericParams::default();
127 let mut sm = ArenaMap::default(); 134 let mut sm = ArenaMap::default();
128 135
129 // FIXME: add `: Sized` bound for everything except for `Self` in traits 136 // FIXME: add `: Sized` bound for everything except for `Self` in traits
@@ -171,7 +178,7 @@ impl GenericParams {
171 // add super traits as bounds on Self 178 // add super traits as bounds on Self
172 // i.e., trait Foo: Bar is equivalent to trait Foo where Self: Bar 179 // i.e., trait Foo: Bar is equivalent to trait Foo where Self: Bar
173 let self_param = TypeRef::Path(name![Self].into()); 180 let self_param = TypeRef::Path(name![Self].into());
174 generics.fill_bounds(&lower_ctx, &src.value, self_param); 181 generics.fill_bounds(&lower_ctx, &src.value, Either::Left(self_param));
175 182
176 generics.fill(&lower_ctx, &mut sm, &src.value); 183 generics.fill(&lower_ctx, &mut sm, &src.value);
177 src.file_id 184 src.file_id
@@ -218,12 +225,12 @@ impl GenericParams {
218 &mut self, 225 &mut self,
219 lower_ctx: &LowerCtx, 226 lower_ctx: &LowerCtx,
220 node: &dyn ast::TypeBoundsOwner, 227 node: &dyn ast::TypeBoundsOwner,
221 type_ref: TypeRef, 228 target: Either<TypeRef, LifetimeRef>,
222 ) { 229 ) {
223 for bound in 230 for bound in
224 node.type_bound_list().iter().flat_map(|type_bound_list| type_bound_list.bounds()) 231 node.type_bound_list().iter().flat_map(|type_bound_list| type_bound_list.bounds())
225 { 232 {
226 self.add_where_predicate_from_bound(lower_ctx, bound, type_ref.clone()); 233 self.add_where_predicate_from_bound(lower_ctx, bound, target.clone());
227 } 234 }
228 } 235 }
229 236
@@ -246,19 +253,30 @@ impl GenericParams {
246 sm.insert(param_id, Either::Right(type_param.clone())); 253 sm.insert(param_id, Either::Right(type_param.clone()));
247 254
248 let type_ref = TypeRef::Path(name.into()); 255 let type_ref = TypeRef::Path(name.into());
249 self.fill_bounds(&lower_ctx, &type_param, type_ref); 256 self.fill_bounds(&lower_ctx, &type_param, Either::Left(type_ref));
257 }
258 for lifetime_param in params.lifetime_params() {
259 let name = lifetime_param
260 .lifetime_token()
261 .map_or_else(Name::missing, |tok| Name::new_lifetime(&tok));
262 let param = LifetimeParamData { name: name.clone() };
263 let _param_id = self.lifetimes.alloc(param);
264 let lifetime_ref = LifetimeRef::new_name(name);
265 self.fill_bounds(&lower_ctx, &lifetime_param, Either::Right(lifetime_ref));
250 } 266 }
251 } 267 }
252 268
253 fn fill_where_predicates(&mut self, lower_ctx: &LowerCtx, where_clause: ast::WhereClause) { 269 fn fill_where_predicates(&mut self, lower_ctx: &LowerCtx, where_clause: ast::WhereClause) {
254 for pred in where_clause.predicates() { 270 for pred in where_clause.predicates() {
255 let type_ref = match pred.ty() { 271 let target = if let Some(type_ref) = pred.ty() {
256 Some(type_ref) => type_ref, 272 Either::Left(TypeRef::from_ast(lower_ctx, type_ref))
257 None => continue, 273 } else if let Some(lifetime_tok) = pred.lifetime_token() {
274 Either::Right(LifetimeRef::from_token(lifetime_tok))
275 } else {
276 continue;
258 }; 277 };
259 let type_ref = TypeRef::from_ast(lower_ctx, type_ref);
260 for bound in pred.type_bound_list().iter().flat_map(|l| l.bounds()) { 278 for bound in pred.type_bound_list().iter().flat_map(|l| l.bounds()) {
261 self.add_where_predicate_from_bound(lower_ctx, bound, type_ref.clone()); 279 self.add_where_predicate_from_bound(lower_ctx, bound, target.clone());
262 } 280 }
263 } 281 }
264 } 282 }
@@ -267,15 +285,24 @@ impl GenericParams {
267 &mut self, 285 &mut self,
268 lower_ctx: &LowerCtx, 286 lower_ctx: &LowerCtx,
269 bound: ast::TypeBound, 287 bound: ast::TypeBound,
270 type_ref: TypeRef, 288 target: Either<TypeRef, LifetimeRef>,
271 ) { 289 ) {
272 if bound.question_mark_token().is_some() { 290 if bound.question_mark_token().is_some() {
273 // FIXME: remove this bound 291 // FIXME: remove this bound
274 return; 292 return;
275 } 293 }
276 let bound = TypeBound::from_ast(lower_ctx, bound); 294 let bound = TypeBound::from_ast(lower_ctx, bound);
277 self.where_predicates 295 let predicate = match (target, bound) {
278 .push(WherePredicate { target: WherePredicateTarget::TypeRef(type_ref), bound }); 296 (Either::Left(type_ref), bound) => WherePredicate::TypeBound {
297 target: WherePredicateTypeTarget::TypeRef(type_ref),
298 bound,
299 },
300 (Either::Right(lifetime), TypeBound::Lifetime(bound)) => {
301 WherePredicate::Lifetime { target: lifetime, bound }
302 }
303 _ => return,
304 };
305 self.where_predicates.push(predicate);
279 } 306 }
280 307
281 pub(crate) fn fill_implicit_impl_trait_args(&mut self, type_ref: &TypeRef) { 308 pub(crate) fn fill_implicit_impl_trait_args(&mut self, type_ref: &TypeRef) {
@@ -288,8 +315,8 @@ impl GenericParams {
288 }; 315 };
289 let param_id = self.types.alloc(param); 316 let param_id = self.types.alloc(param);
290 for bound in bounds { 317 for bound in bounds {
291 self.where_predicates.push(WherePredicate { 318 self.where_predicates.push(WherePredicate::TypeBound {
292 target: WherePredicateTarget::TypeParam(param_id), 319 target: WherePredicateTypeTarget::TypeParam(param_id),
293 bound: bound.clone(), 320 bound: bound.clone(),
294 }); 321 });
295 } 322 }
diff --git a/crates/hir_def/src/item_tree.rs b/crates/hir_def/src/item_tree.rs
index c017b352d..c6ada271e 100644
--- a/crates/hir_def/src/item_tree.rs
+++ b/crates/hir_def/src/item_tree.rs
@@ -255,7 +255,7 @@ impl GenericParamsStorage {
255} 255}
256 256
257static EMPTY_GENERICS: GenericParams = 257static EMPTY_GENERICS: GenericParams =
258 GenericParams { types: Arena::new(), where_predicates: Vec::new() }; 258 GenericParams { types: Arena::new(), lifetimes: Arena::new(), where_predicates: Vec::new() };
259 259
260#[derive(Default, Debug, Eq, PartialEq)] 260#[derive(Default, Debug, Eq, PartialEq)]
261struct ItemTreeData { 261struct ItemTreeData {
diff --git a/crates/hir_def/src/item_tree/lower.rs b/crates/hir_def/src/item_tree/lower.rs
index 63b2826f8..f7ce2e26d 100644
--- a/crates/hir_def/src/item_tree/lower.rs
+++ b/crates/hir_def/src/item_tree/lower.rs
@@ -13,6 +13,7 @@ use syntax::{
13use crate::{ 13use crate::{
14 attr::Attrs, 14 attr::Attrs,
15 generics::{GenericParams, TypeParamData, TypeParamProvenance}, 15 generics::{GenericParams, TypeParamData, TypeParamProvenance},
16 type_ref::LifetimeRef,
16}; 17};
17 18
18use super::*; 19use super::*;
@@ -292,12 +293,16 @@ impl Ctx {
292 let self_type = TypeRef::Path(name![Self].into()); 293 let self_type = TypeRef::Path(name![Self].into());
293 match self_param.kind() { 294 match self_param.kind() {
294 ast::SelfParamKind::Owned => self_type, 295 ast::SelfParamKind::Owned => self_type,
295 ast::SelfParamKind::Ref => { 296 ast::SelfParamKind::Ref => TypeRef::Reference(
296 TypeRef::Reference(Box::new(self_type), Mutability::Shared) 297 Box::new(self_type),
297 } 298 self_param.lifetime_token().map(LifetimeRef::from_token),
298 ast::SelfParamKind::MutRef => { 299 Mutability::Shared,
299 TypeRef::Reference(Box::new(self_type), Mutability::Mut) 300 ),
300 } 301 ast::SelfParamKind::MutRef => TypeRef::Reference(
302 Box::new(self_type),
303 self_param.lifetime_token().map(LifetimeRef::from_token),
304 Mutability::Mut,
305 ),
301 } 306 }
302 } 307 }
303 }; 308 };
@@ -629,8 +634,7 @@ impl Ctx {
629 // add super traits as bounds on Self 634 // add super traits as bounds on Self
630 // i.e., trait Foo: Bar is equivalent to trait Foo where Self: Bar 635 // i.e., trait Foo: Bar is equivalent to trait Foo where Self: Bar
631 let self_param = TypeRef::Path(name![Self].into()); 636 let self_param = TypeRef::Path(name![Self].into());
632 generics.fill_bounds(&self.body_ctx, trait_def, self_param); 637 generics.fill_bounds(&self.body_ctx, trait_def, Either::Left(self_param));
633
634 generics.fill(&self.body_ctx, &mut sm, node); 638 generics.fill(&self.body_ctx, &mut sm, node);
635 } 639 }
636 GenericsOwner::Impl => { 640 GenericsOwner::Impl => {
diff --git a/crates/hir_def/src/lib.rs b/crates/hir_def/src/lib.rs
index a75d4d302..7e2199a9c 100644
--- a/crates/hir_def/src/lib.rs
+++ b/crates/hir_def/src/lib.rs
@@ -225,6 +225,13 @@ pub struct TypeParamId {
225pub type LocalTypeParamId = Idx<generics::TypeParamData>; 225pub type LocalTypeParamId = Idx<generics::TypeParamData>;
226 226
227#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] 227#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
228pub struct LifetimeParamId {
229 pub parent: GenericDefId,
230 pub local_id: LocalLifetimeParamId,
231}
232pub type LocalLifetimeParamId = Idx<generics::LifetimeParamData>;
233
234#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
228pub enum ContainerId { 235pub enum ContainerId {
229 ModuleId(ModuleId), 236 ModuleId(ModuleId),
230 DefWithBodyId(DefWithBodyId), 237 DefWithBodyId(DefWithBodyId),
diff --git a/crates/hir_def/src/path.rs b/crates/hir_def/src/path.rs
index 5b8c1e449..00a69a8a6 100644
--- a/crates/hir_def/src/path.rs
+++ b/crates/hir_def/src/path.rs
@@ -7,7 +7,7 @@ use std::{
7 sync::Arc, 7 sync::Arc,
8}; 8};
9 9
10use crate::body::LowerCtx; 10use crate::{body::LowerCtx, type_ref::LifetimeRef};
11use base_db::CrateId; 11use base_db::CrateId;
12use hir_expand::{ 12use hir_expand::{
13 hygiene::Hygiene, 13 hygiene::Hygiene,
@@ -145,7 +145,7 @@ pub struct AssociatedTypeBinding {
145#[derive(Debug, Clone, PartialEq, Eq, Hash)] 145#[derive(Debug, Clone, PartialEq, Eq, Hash)]
146pub enum GenericArg { 146pub enum GenericArg {
147 Type(TypeRef), 147 Type(TypeRef),
148 // or lifetime... 148 Lifetime(LifetimeRef),
149} 149}
150 150
151impl Path { 151impl Path {
diff --git a/crates/hir_def/src/path/lower.rs b/crates/hir_def/src/path/lower.rs
index 07b9723ce..60fa7646b 100644
--- a/crates/hir_def/src/path/lower.rs
+++ b/crates/hir_def/src/path/lower.rs
@@ -15,7 +15,7 @@ use super::AssociatedTypeBinding;
15use crate::{ 15use crate::{
16 body::LowerCtx, 16 body::LowerCtx,
17 path::{GenericArg, GenericArgs, ModPath, Path, PathKind}, 17 path::{GenericArg, GenericArgs, ModPath, Path, PathKind},
18 type_ref::{TypeBound, TypeRef}, 18 type_ref::{LifetimeRef, TypeBound, TypeRef},
19}; 19};
20 20
21pub(super) use lower_use::lower_use_tree; 21pub(super) use lower_use::lower_use_tree;
@@ -170,8 +170,14 @@ pub(super) fn lower_generic_args(
170 bindings.push(AssociatedTypeBinding { name, type_ref, bounds }); 170 bindings.push(AssociatedTypeBinding { name, type_ref, bounds });
171 } 171 }
172 } 172 }
173 // Lifetimes and constants are ignored for now. 173 ast::GenericArg::LifetimeArg(lifetime_arg) => {
174 ast::GenericArg::LifetimeArg(_) | ast::GenericArg::ConstArg(_) => (), 174 if let Some(lifetime) = lifetime_arg.lifetime_token() {
175 let lifetime_ref = LifetimeRef::from_token(lifetime);
176 args.push(GenericArg::Lifetime(lifetime_ref))
177 }
178 }
179 // constants are ignored for now.
180 ast::GenericArg::ConstArg(_) => (),
175 } 181 }
176 } 182 }
177 183
diff --git a/crates/hir_def/src/type_ref.rs b/crates/hir_def/src/type_ref.rs
index 1a78c1444..347ceabb9 100644
--- a/crates/hir_def/src/type_ref.rs
+++ b/crates/hir_def/src/type_ref.rs
@@ -1,6 +1,7 @@
1//! HIR for references to types. Paths in these are not yet resolved. They can 1//! HIR for references to types. Paths in these are not yet resolved. They can
2//! be directly created from an ast::TypeRef, without further queries. 2//! be directly created from an ast::TypeRef, without further queries.
3use syntax::ast::{self}; 3use hir_expand::name::Name;
4use syntax::{ast, SyntaxToken};
4 5
5use crate::{body::LowerCtx, path::Path}; 6use crate::{body::LowerCtx, path::Path};
6 7
@@ -58,7 +59,7 @@ pub enum TypeRef {
58 Tuple(Vec<TypeRef>), 59 Tuple(Vec<TypeRef>),
59 Path(Path), 60 Path(Path),
60 RawPtr(Box<TypeRef>, Mutability), 61 RawPtr(Box<TypeRef>, Mutability),
61 Reference(Box<TypeRef>, Mutability), 62 Reference(Box<TypeRef>, Option<LifetimeRef>, Mutability),
62 Array(Box<TypeRef> /*, Expr*/), 63 Array(Box<TypeRef> /*, Expr*/),
63 Slice(Box<TypeRef>), 64 Slice(Box<TypeRef>),
64 /// A fn pointer. Last element of the vector is the return type. 65 /// A fn pointer. Last element of the vector is the return type.
@@ -70,10 +71,29 @@ pub enum TypeRef {
70} 71}
71 72
72#[derive(Clone, PartialEq, Eq, Hash, Debug)] 73#[derive(Clone, PartialEq, Eq, Hash, Debug)]
74pub struct LifetimeRef {
75 pub name: Name,
76}
77
78impl LifetimeRef {
79 pub(crate) fn new_name(name: Name) -> Self {
80 LifetimeRef { name }
81 }
82
83 pub(crate) fn from_token(token: SyntaxToken) -> Self {
84 LifetimeRef { name: Name::new_lifetime(&token) }
85 }
86
87 pub fn missing() -> LifetimeRef {
88 LifetimeRef { name: Name::missing() }
89 }
90}
91
92#[derive(Clone, PartialEq, Eq, Hash, Debug)]
73pub enum TypeBound { 93pub enum TypeBound {
74 Path(Path), 94 Path(Path),
75 // also for<> bounds 95 // ForLifetime(Vec<LifetimeRef>, Path), FIXME ForLifetime
76 // also Lifetimes 96 Lifetime(LifetimeRef),
77 Error, 97 Error,
78} 98}
79 99
@@ -107,8 +127,9 @@ impl TypeRef {
107 } 127 }
108 ast::Type::RefType(inner) => { 128 ast::Type::RefType(inner) => {
109 let inner_ty = TypeRef::from_ast_opt(&ctx, inner.ty()); 129 let inner_ty = TypeRef::from_ast_opt(&ctx, inner.ty());
130 let lifetime = inner.lifetime_token().map(|t| LifetimeRef::from_token(t));
110 let mutability = Mutability::from_mutable(inner.mut_token().is_some()); 131 let mutability = Mutability::from_mutable(inner.mut_token().is_some());
111 TypeRef::Reference(Box::new(inner_ty), mutability) 132 TypeRef::Reference(Box::new(inner_ty), lifetime, mutability)
112 } 133 }
113 ast::Type::InferType(_inner) => TypeRef::Placeholder, 134 ast::Type::InferType(_inner) => TypeRef::Placeholder,
114 ast::Type::FnPtrType(inner) => { 135 ast::Type::FnPtrType(inner) => {
@@ -163,14 +184,14 @@ impl TypeRef {
163 types.iter().for_each(|t| go(t, f)) 184 types.iter().for_each(|t| go(t, f))
164 } 185 }
165 TypeRef::RawPtr(type_ref, _) 186 TypeRef::RawPtr(type_ref, _)
166 | TypeRef::Reference(type_ref, _) 187 | TypeRef::Reference(type_ref, ..)
167 | TypeRef::Array(type_ref) 188 | TypeRef::Array(type_ref)
168 | TypeRef::Slice(type_ref) => go(&type_ref, f), 189 | TypeRef::Slice(type_ref) => go(&type_ref, f),
169 TypeRef::ImplTrait(bounds) | TypeRef::DynTrait(bounds) => { 190 TypeRef::ImplTrait(bounds) | TypeRef::DynTrait(bounds) => {
170 for bound in bounds { 191 for bound in bounds {
171 match bound { 192 match bound {
172 TypeBound::Path(path) => go_path(path, f), 193 TypeBound::Path(path) => go_path(path, f),
173 TypeBound::Error => (), 194 TypeBound::Lifetime(_) | TypeBound::Error => (),
174 } 195 }
175 } 196 }
176 } 197 }
@@ -186,8 +207,12 @@ impl TypeRef {
186 for segment in path.segments().iter() { 207 for segment in path.segments().iter() {
187 if let Some(args_and_bindings) = segment.args_and_bindings { 208 if let Some(args_and_bindings) = segment.args_and_bindings {
188 for arg in &args_and_bindings.args { 209 for arg in &args_and_bindings.args {
189 let crate::path::GenericArg::Type(type_ref) = arg; 210 match arg {
190 go(type_ref, f); 211 crate::path::GenericArg::Type(type_ref) => {
212 go(type_ref, f);
213 }
214 crate::path::GenericArg::Lifetime(_) => {}
215 }
191 } 216 }
192 for binding in &args_and_bindings.bindings { 217 for binding in &args_and_bindings.bindings {
193 if let Some(type_ref) = &binding.type_ref { 218 if let Some(type_ref) = &binding.type_ref {
@@ -196,7 +221,7 @@ impl TypeRef {
196 for bound in &binding.bounds { 221 for bound in &binding.bounds {
197 match bound { 222 match bound {
198 TypeBound::Path(path) => go_path(path, f), 223 TypeBound::Path(path) => go_path(path, f),
199 TypeBound::Error => (), 224 TypeBound::Lifetime(_) | TypeBound::Error => (),
200 } 225 }
201 } 226 }
202 } 227 }
@@ -232,7 +257,10 @@ impl TypeBound {
232 }; 257 };
233 TypeBound::Path(path) 258 TypeBound::Path(path)
234 } 259 }
235 ast::TypeBoundKind::ForType(_) | ast::TypeBoundKind::Lifetime(_) => TypeBound::Error, 260 ast::TypeBoundKind::ForType(_) => TypeBound::Error, // FIXME ForType
261 ast::TypeBoundKind::Lifetime(lifetime) => {
262 TypeBound::Lifetime(LifetimeRef::from_token(lifetime))
263 }
236 } 264 }
237 } 265 }
238 266