about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-03-02 14:53:51 -0500
committerGitHub <noreply@github.com>2017-03-02 14:53:51 -0500
commitba39e5d905dc5a32c1156db780635612deeb2bd0 (patch)
treebdaa88e5cf3168fc14db53d0171f74d54094110d
parent05e0d740a22b327f607dd695b43f7547e0d14864 (diff)
parentc58fff2bb76b055c8276551d54a99aea997c34ed (diff)
downloadrust-ba39e5d905dc5a32c1156db780635612deeb2bd0.tar.gz
rust-ba39e5d905dc5a32c1156db780635612deeb2bd0.zip
Rollup merge of #40166 - aidanhs:aphs-index-coerce, r=nikomatsakis
Allow types passed to [] to coerce, like .index()

Fixes #40085

Basically steals the relevant part of [check_argument_types](https://github.com/rust-lang/rust/blob/1.15.1/src/librustc_typeck/check/mod.rs#L2653-L2672).
-rw-r--r--src/librustc_typeck/check/mod.rs2
-rw-r--r--src/test/run-pass/issue-40085.rs22
2 files changed, 23 insertions, 1 deletions
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index 0337727dcba..d21bb68d4c8 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -3895,7 +3895,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
                   let base_t = self.structurally_resolved_type(expr.span, base_t);
                   match self.lookup_indexing(expr, base, base_t, idx_t, lvalue_pref) {
                       Some((index_ty, element_ty)) => {
-                          self.demand_eqtype(expr.span, index_ty, idx_t);
+                          self.demand_coerce(idx, idx_t, index_ty);
                           element_ty
                       }
                       None => {
diff --git a/src/test/run-pass/issue-40085.rs b/src/test/run-pass/issue-40085.rs
new file mode 100644
index 00000000000..b6d02908a0f
--- /dev/null
+++ b/src/test/run-pass/issue-40085.rs
@@ -0,0 +1,22 @@
+// 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;
+fn bar() {}
+static UNIT: () = ();
+struct S;
+impl Index<fn()> for S {
+    type Output = ();
+    fn index(&self, _: fn()) -> &() { &UNIT }
+}
+fn main() {
+    S.index(bar);
+    S[bar];
+}