Skip to content

Commit

Permalink
Work around a borrow surviving too long (fixes rust-lang#37686)
Browse files Browse the repository at this point in the history
  • Loading branch information
nox authored and brson committed Dec 15, 2016
1 parent 9911f0e commit 5a42929
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/librustc_const_eval/pattern.rs
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,8 @@ impl<'a, 'gcx, 'tcx> PatternContext<'a, 'gcx, 'tcx> {
}

PatKind::Tuple(ref subpatterns, ddpos) => {
match self.tcx.tables().node_id_to_type(pat.id).sty {
let ty = self.tcx.tables().node_id_to_type(pat.id);
match ty.sty {
ty::TyTuple(ref tys) => {
let subpatterns =
subpatterns.iter()
Expand Down
16 changes: 16 additions & 0 deletions src/test/run-pass/issue-37686.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright 2016 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.

fn main() {
match (0, 0) {
(std::usize::MIN, std::usize::MAX) => {}
_ => {}
}
}

0 comments on commit 5a42929

Please sign in to comment.