Tweak "non-primitive cast" error

[rust.git] / src / test / ui / issues / issue-22312.rs

diff --git a/src/test/ui/issues/issue-22312.rs b/src/test/ui/issues/issue-22312.rs
index 2128c4206301b3848968c48eb9db804b5a75a17e..4e359b3412a71e8400aca880fea2c4cadf9f93f6 100644 (file)
--- a/src/test/ui/issues/issue-22312.rs
+++ b/src/test/ui/issues/issue-22312.rs
@@ -1,16 +1,6 @@
-// Copyright 2015 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.
-
 use std::ops::Index;
 
-pub trait Array2D: Index<usize> {
+pub trait Array2D: Index<usize> + Sized {
     fn rows(&self) -> usize;
     fn columns(&self) -> usize;
     fn get<'a>(&'a self, y: usize, x: usize) -> Option<&'a <Self as Index<usize>>::Output> {
@@ -18,7 +8,7 @@ fn get<'a>(&'a self, y: usize, x: usize) -> Option<&'a <Self as Index<usize>>::O
             return None;
         }
         let i = y * self.columns() + x;
-        let indexer = &(*self as &Index<usize, Output = <Self as Index<usize>>::Output>);
+        let indexer = &(*self as &dyn Index<usize, Output = <Self as Index<usize>>::Output>);
         //~^ERROR non-primitive cast
         Some(indexer.index(i))
     }