Skip to content

Commit 81ab4d7

Browse files
committed
---
yaml --- r: 115192 b: refs/heads/auto c: aef1a9c h: refs/heads/master v: v3
1 parent 6d763d0 commit 81ab4d7

File tree

3 files changed

+30
-12
lines changed

3 files changed

+30
-12
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: fd88e2b7291170d0dac536130307a8cc680c8294
16+
refs/heads/auto: aef1a9c57b2b21f3a227ead094d4d7add6f57522
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/middle/typeck/check/method.rs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -555,17 +555,13 @@ impl<'a> LookupContext<'a> {
555555
param_ty: param_ty) {
556556
debug!("push_inherent_candidates_from_param(param_ty={:?})",
557557
param_ty);
558-
self.push_inherent_candidates_from_bounds(
559-
rcvr_ty,
560-
self.fcx
561-
.inh
562-
.param_env
563-
.type_param_bounds
564-
.get(param_ty.idx)
565-
.trait_bounds
566-
.as_slice(),
567-
restrict_to,
568-
param_numbered(param_ty.idx));
558+
let i = param_ty.idx;
559+
match self.fcx.inh.param_env.type_param_bounds.as_slice().get(i) {
560+
Some(b) => self.push_inherent_candidates_from_bounds(
561+
rcvr_ty, b.trait_bounds.as_slice(), restrict_to,
562+
param_numbered(param_ty.idx)),
563+
None => {}
564+
}
569565
}
570566

571567

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
enum Whatever {
12+
}
13+
14+
fn foo(x: Whatever) {
15+
match x {
16+
Some(field) => field.access(),
17+
//~^ ERROR: mismatched types: expected `Whatever` but found
18+
//~^^ ERROR: does not implement any method in scope named `access`
19+
}
20+
}
21+
22+
fn main(){}

0 commit comments

Comments
 (0)