Skip to content

Commit

Permalink
auto merge of #16802 : nick29581/rust/dst-bug-1, r=luqmana
Browse files Browse the repository at this point in the history
  • Loading branch information
bors committed Sep 1, 2014
2 parents 0fd4f42 + d13fe1c commit 12b438c
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/librustc/middle/ty.rs
Expand Up @@ -3305,6 +3305,11 @@ pub fn adjust_ty(cx: &ctxt,
-> ty::t {
/*! See `expr_ty_adjusted` */

match get(unadjusted_ty).sty {
ty_err => return unadjusted_ty,
_ => {}
}

return match adjustment {
Some(adjustment) => {
match *adjustment {
Expand Down
15 changes: 15 additions & 0 deletions src/test/compile-fail/issue-16783.rs
@@ -0,0 +1,15 @@
// 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 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

pub fn main() {
let x = [1, 2, 3];
//~^ ERROR cannot determine a type for this local variable: cannot determine the type of this
let y = x.as_slice();
}

0 comments on commit 12b438c

Please sign in to comment.