Skip to content

Commit

Permalink
Rollup merge of rust-lang#53349 - memoryruins:nll-tests, r=nikomatsakis
Browse files Browse the repository at this point in the history
[nll] add tests for rust-lang#48697 and rust-lang#30104

Adds tests for the following issues:
- rust-lang#48697 ``[NLL] ICE: unexpected region for local data with reference to closure``
- rust-lang#30104 ``Destructuring boxes into multiple mutable references seems broken``

r? @nikomatsakis
  • Loading branch information
frewsxcv authored Aug 17, 2018
2 parents 3de02d3 + f4bed39 commit 25aca44
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 0 deletions.
52 changes: 52 additions & 0 deletions src/test/ui/nll/issue-30104.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// Copyright 2018 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.

// Regression test for #30104

// compile-pass

#![feature(nll)]

use std::ops::{Deref, DerefMut};

fn box_two_field(v: &mut Box<(i32, i32)>) {
let _a = &mut v.0;
let _b = &mut v.1;
}

fn box_destructure(v: &mut Box<(i32, i32)>) {
let (ref mut _head, ref mut _tail) = **v;
}

struct Wrap<T>(T);

impl<T> Deref for Wrap<T> {
type Target = T;
fn deref(&self) -> &T {
&self.0
}
}

impl<T> DerefMut for Wrap<T> {
fn deref_mut(&mut self) -> &mut T {
&mut self.0
}
}

fn smart_two_field(v: &mut Wrap<(i32, i32)>) {
let _a = &mut v.0;
let _b = &mut v.1;
}

fn smart_destructure(v: &mut Wrap<(i32, i32)>) {
let (ref mut _head, ref mut _tail) = **v;
}

fn main() {}
24 changes: 24 additions & 0 deletions src/test/ui/nll/issue-48697.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Copyright 2018 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.

// Regression test for #48697

// compile-pass

#![feature(nll)]

fn foo(x: &i32) -> &i32 {
let z = 4;
let f = &|y| y;
let k = f(&z);
f(x)
}

fn main() {}

0 comments on commit 25aca44

Please sign in to comment.