From 59fb880117c8c556161a086a64dace23a1f69d5d Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Fri, 4 Apr 2014 18:03:12 +1300 Subject: [PATCH] Allow bounds on type variables in enums & structs Does not do any checking of bounds, just allows them to exist. --- src/librustc/middle/resolve.rs | 5 ++-- src/librustc/middle/typeck/collect.rs | 12 ++++----- src/test/compile-fail/struct-enum-bounds-1.rs | 21 +++++++++++++++ src/test/compile-fail/struct-enum-bounds-2.rs | 18 +++++++++++++ src/test/run-pass/struct-enum-bounds.rs | 27 +++++++++++++++++++ 5 files changed, 74 insertions(+), 9 deletions(-) create mode 100644 src/test/compile-fail/struct-enum-bounds-1.rs create mode 100644 src/test/compile-fail/struct-enum-bounds-2.rs create mode 100644 src/test/run-pass/struct-enum-bounds.rs diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs index 143b02f96d22f..2d9ad2f67730d 100644 --- a/src/librustc/middle/resolve.rs +++ b/src/librustc/middle/resolve.rs @@ -3602,7 +3602,8 @@ impl<'a> Resolver<'a> { 0, NormalRibKind), |this| { - visit::walk_item(this, item, ()); + this.resolve_type_parameters(&generics.ty_params); + visit::walk_enum_def(this, enum_def, generics, ()); }); } @@ -3859,7 +3860,7 @@ impl<'a> Resolver<'a> { } fn resolve_type_parameters(&mut self, - type_parameters: &OwnedSlice) { + type_parameters: &OwnedSlice) { for type_parameter in type_parameters.iter() { for bound in type_parameter.bounds.iter() { self.resolve_type_parameter_bound(type_parameter.id, bound); diff --git a/src/librustc/middle/typeck/collect.rs b/src/librustc/middle/typeck/collect.rs index 274f88ad4c37d..e202724633e24 100644 --- a/src/librustc/middle/typeck/collect.rs +++ b/src/librustc/middle/typeck/collect.rs @@ -566,9 +566,9 @@ pub fn convert(ccx: &CrateCtxt, it: &ast::Item) { // These don't define types. ast::ItemForeignMod(_) | ast::ItemMod(_) | ast::ItemMac(_) => {} ast::ItemEnum(ref enum_definition, ref generics) => { - ensure_no_ty_param_bounds(ccx, it.span, generics, "enumeration"); let tpt = ty_of_item(ccx, it); write_ty_to_tcx(tcx, it.id, tpt.ty); + tcx.tcache.borrow_mut().insert(local_def(it.id), tpt.clone()); get_enum_variant_types(ccx, tpt.ty, enum_definition.variants.as_slice(), @@ -580,9 +580,9 @@ pub fn convert(ccx: &CrateCtxt, it: &ast::Item) { write_ty_to_tcx(tcx, it.id, selfty); tcx.tcache.borrow_mut().insert(local_def(it.id), - ty_param_bounds_and_ty { - generics: ty_generics.clone(), - ty: selfty}); + ty_param_bounds_and_ty { + generics: ty_generics.clone(), + ty: selfty}); // If there is a trait reference, treat the methods as always public. // This is to work around some incorrect behavior in privacy checking: @@ -634,9 +634,7 @@ pub fn convert(ccx: &CrateCtxt, it: &ast::Item) { // static trait methods. This is somewhat unfortunate. ensure_trait_methods(ccx, it.id); }, - ast::ItemStruct(struct_def, ref generics) => { - ensure_no_ty_param_bounds(ccx, it.span, generics, "structure"); - + ast::ItemStruct(struct_def, _) => { // Write the class type let tpt = ty_of_item(ccx, it); write_ty_to_tcx(tcx, it.id, tpt.ty); diff --git a/src/test/compile-fail/struct-enum-bounds-1.rs b/src/test/compile-fail/struct-enum-bounds-1.rs new file mode 100644 index 0000000000000..08773fade123e --- /dev/null +++ b/src/test/compile-fail/struct-enum-bounds-1.rs @@ -0,0 +1,21 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Test that incorrect bounds in structs and enums are picked up. + +struct Foo; //~ERROR attempt to bound type parameter with a nonexistent trait `T` +enum Bar {} //~ERROR attempt to bound type parameter with a nonexistent trait `T` + +trait T2 {} + +struct Baz>; //~ ERROR use of undeclared type name `T` +enum Qux> {} //~ ERROR use of undeclared type name `T` + +fn main() {} diff --git a/src/test/compile-fail/struct-enum-bounds-2.rs b/src/test/compile-fail/struct-enum-bounds-2.rs new file mode 100644 index 0000000000000..5ccfd15931d76 --- /dev/null +++ b/src/test/compile-fail/struct-enum-bounds-2.rs @@ -0,0 +1,18 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Test that incorrect bounds in structs and enums are picked up. + +trait T<'a> {} + +struct Baz2>; //~ERROR use of undeclared lifetime name `'a` +enum Quz2> {} //~ERROR use of undeclared lifetime name `'a` + +fn main() {} diff --git a/src/test/run-pass/struct-enum-bounds.rs b/src/test/run-pass/struct-enum-bounds.rs new file mode 100644 index 0000000000000..2b053b9c59525 --- /dev/null +++ b/src/test/run-pass/struct-enum-bounds.rs @@ -0,0 +1,27 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Test that bounds are allowed on structs and enums. + +trait T {} + +struct S; + +enum E { +} + +impl S {} +impl E {} + +trait T2<'a> {} + +struct S2<'a, X: T2<'a>>; + +fn main() {}