diff options
| author | bors <bors@rust-lang.org> | 2019-05-22 08:22:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-22 08:22:17 +0000 |
| commit | 37ff5d388f8c004ca248adb635f1cc84d347eda0 (patch) | |
| tree | 460137db1b121095313303ae6c78f2698bd15159 /src/libsyntax | |
| parent | 1cc822c261f5c94a41eb725755fdda7ca6efbda2 (diff) | |
| parent | ce2ee305f9165c037ecddddb5792588a15ff6c37 (diff) | |
| download | rust-37ff5d388f8c004ca248adb635f1cc84d347eda0.tar.gz rust-37ff5d388f8c004ca248adb635f1cc84d347eda0.zip | |
Auto merge of #59445 - alexreg:ban-multi-trait-objects-via-aliases, r=oli-obk
Ban multi-trait objects via trait aliases Obviously, multi-trait objects are not normally supported, so they should not be supported via trait aliases. This has been factored out from the previous PR https://github.com/rust-lang/rust/pull/55994 (see point 1). r? @Centril CC @nikomatsakis ------------------ ### RELNOTES: We now allow `dyn Send + fmt::Debug` with equivalent semantics to `dyn fmt::Debug + Send`. That is, the order of the mentioned traits does not matter wrt. principal/not-principal traits. This is a small change that might deserve a mention in the blog post because it is a language change but most likely not. See https://github.com/rust-lang/rust/blob/ce2ee305f9165c037ecddddb5792588a15ff6c37/src/test/ui/traits/wf-trait-object-reverse-order.rs. // @Centril
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index a6bb47bef87..da45bc1d9f5 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -2129,10 +2129,10 @@ pub struct TraitRef { #[derive(Clone, RustcEncodable, RustcDecodable, Debug)] pub struct PolyTraitRef { - /// The `'a` in `<'a> Foo<&'a T>` + /// The `'a` in `<'a> Foo<&'a T>`. pub bound_generic_params: Vec<GenericParam>, - /// The `Foo<&'a T>` in `<'a> Foo<&'a T>` + /// The `Foo<&'a T>` in `<'a> Foo<&'a T>`. pub trait_ref: TraitRef, pub span: Span, |