]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #55101 - alexreg:trait-aliases, r=nikomatsakis
authorbors <bors@rust-lang.org>
Sat, 3 Nov 2018 17:30:37 +0000 (17:30 +0000)
committerbors <bors@rust-lang.org>
Sat, 3 Nov 2018 17:30:37 +0000 (17:30 +0000)
Implement trait aliases (RFC 1733)

Extends groundwork done in https://github.com/rust-lang/rust/pull/45047, and fully implements https://github.com/rust-lang/rfcs/pull/1733.

CC @durka @nikomatsakis

1  2 
src/librustc/ich/impls_ty.rs
src/librustc/traits/mod.rs
src/librustc/traits/project.rs
src/librustc/traits/select.rs
src/librustc/ty/instance.rs
src/librustc/ty/mod.rs
src/librustc/ty/sty.rs
src/librustc/ty/util.rs
src/librustc_typeck/astconv.rs
src/librustc_typeck/collect.rs

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 46f2c0c76a0c7b457cb19b140428ed69b92b1cb1,e44cfec82ad642f624d224b6e7920c3f372b0977..18f8473b5b56d7d88fb600878aaa16ff8fbbe0b3
@@@ -1009,11 -1009,11 +1009,11 @@@ impl<'o, 'gcx: 'tcx, 'tcx> dyn AstConv<
              })
          });
  
-         // check that there are no gross object safety violations,
+         // Check that there are no gross object safety violations;
          // most importantly, that the supertraits don't contain Self,
-         // to avoid ICE-s.
+         // to avoid ICEs.
          let object_safety_violations =
 -            tcx.astconv_object_safety_violations(principal.def_id());
 +            tcx.global_tcx().astconv_object_safety_violations(principal.def_id());
          if !object_safety_violations.is_empty() {
              tcx.report_object_safety_error(
                  span, principal.def_id(), object_safety_violations)
Simple merge