OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed unsize changing adjusted type

Browse Source 
If the final type coming out of an Adjust is a ref, it is deconstructed.
Also made some formatting changes.
This commit is contained in:
Isaac van Bakel 2018-01-03 23:24:06 +00:00
parent 8ec3696b37
commit 21ddc181f9
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/librustc_typeck/check/writeback.rs
View File

@ -17,7 +17,7 @@ use rustc::hir;
use rustc::hir::def_id::{DefId, DefIndex}; use rustc::hir::def_id::{DefId, DefIndex};
use rustc::hir::intravisit::{self, NestedVisitorMap, Visitor}; use rustc::hir::intravisit::{self, NestedVisitorMap, Visitor};
use rustc::infer::InferCtxt; use rustc::infer::InferCtxt;
use rustc::ty::{self, Ty, TyCtxt}; use rustc::ty::{self, Ty, TyCtxt, TypeVariants};
use rustc::ty::adjustment::{Adjust, Adjustment}; use rustc::ty::adjustment::{Adjust, Adjustment};
use rustc::ty::fold::{TypeFoldable, TypeFolder}; use rustc::ty::fold::{TypeFoldable, TypeFolder};
use rustc::util::nodemap::DefIdSet; use rustc::util::nodemap::DefIdSet;
@ -168,14 +168,23 @@ impl<'cx, 'gcx, 'tcx> WritebackCx<'cx, 'gcx, 'tcx> {
fn fix_index_builtin_expr(&mut self, e: &hir::Expr) { fn fix_index_builtin_expr(&mut self, e: &hir::Expr) {
if let hir::ExprIndex(ref base, ref index) = e.node { if let hir::ExprIndex(ref base, ref index) = e.node {
let mut tables = self.fcx.tables.borrow_mut(); let mut tables = self.fcx.tables.borrow_mut();
let base_ty = tables.expr_ty_adjusted(&base); let base_ty = {
let base_ty = self.fcx.resolve_type_vars_if_possible(&base_ty); let base_ty = tables.expr_ty_adjusted(&base);
// When unsizing, the final type of the expression is taken
// from the first argument of the indexing operator, which
// is a &self, and has to be deconstructed
if let TypeVariants::TyRef(_, ref ref_to) = base_ty.sty {
ref_to.ty
} else {
base_ty
}
};
let index_ty = tables.expr_ty_adjusted(&index); let index_ty = tables.expr_ty_adjusted(&index);
let index_ty = self.fcx.resolve_type_vars_if_possible(&index_ty); let index_ty = self.fcx.resolve_type_vars_if_possible(&index_ty);
if base_ty.builtin_index().is_some() && index_ty.is_uint() { if base_ty.builtin_index().is_some() && index_ty.is_uint() {
// Remove the method call record, which blocks use in // Remove the method call record, which blocks use in
// constant or static cases // constant or static cases
tables.type_dependent_defs_mut().remove(e.hir_id); tables.type_dependent_defs_mut().remove(e.hir_id);