Skip to content

Commit 9716a56

Browse files
committed
---
yaml --- r: 64756 b: refs/heads/snap-stage3 c: f5721c9 h: refs/heads/master v: v3
1 parent 32b00b9 commit 9716a56

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 8582fde15085794c054f1ceee4001e2e1646bcb5
4+
refs/heads/snap-stage3: f5721c9334b2dca5375edd47428d0d317988fb9a
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/metadata/tydecode.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ fn parse_trait_store(st: &mut PState) -> ty::TraitStore {
186186
}
187187

188188
fn parse_substs(st: &mut PState, conv: conv_did) -> ty::substs {
189-
let regions = parse_region_substs(st, |x,y| conv(x,y));
189+
let regions = parse_region_substs(st);
190190

191191
let self_ty = parse_opt(st, |st| parse_ty(st, |x,y| conv(x,y)) );
192192

@@ -202,7 +202,7 @@ fn parse_substs(st: &mut PState, conv: conv_did) -> ty::substs {
202202
};
203203
}
204204

205-
fn parse_region_substs(st: &mut PState, conv: conv_did) -> ty::RegionSubsts {
205+
fn parse_region_substs(st: &mut PState) -> ty::RegionSubsts {
206206
match next(st) {
207207
'e' => ty::ErasedRegions,
208208
'n' => {

branches/snap-stage3/src/librustc/middle/typeck/coherence.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ impl CoherenceChecker {
439439
-> UniversalQuantificationResult {
440440
let regions = match polytype.generics.region_param {
441441
None => opt_vec::Empty,
442-
Some(r) => {
442+
Some(_) => {
443443
opt_vec::with(
444444
self.inference_context.next_region_var(
445445
infer::BoundRegionInCoherence))

0 commit comments

Comments
 (0)