Skip to content

Commit

Permalink
Auto merge of #28873 - dotdash:28339, r=nikomatsakis
Browse files Browse the repository at this point in the history
Fixes #28839
  • Loading branch information
bors committed Oct 7, 2015
2 parents c056cbb + 4da796f commit 3cee9e2
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 5 deletions.
4 changes: 0 additions & 4 deletions src/librustc_typeck/check/coercion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,6 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> {
a,
b);

if a == b {
return Ok(None);
}

// Consider coercing the subtype to a DST
let unsize = self.unpack_actual_value(a, |a| {
self.coerce_unsized(a, b)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fn evil(mut s: &'static mut String)
let alias: &'static mut String = s;
let inner: &str = &alias;
// free value
*s = String::new(); //~ ERROR use of moved value
*s = String::new(); //~ ERROR cannot assign
let _spray = "0wned".to_owned();
// ... and then use it
println!("{}", inner);
Expand Down
24 changes: 24 additions & 0 deletions src/test/run-pass/issue-28839.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// 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.

// ignore-pretty : (#23623) problems with newlines before // comments

pub struct Foo;

pub fn get_foo2<'a>(foo: &'a mut Option<&'a mut Foo>) -> &'a mut Foo {
match foo {
// Ensure that this is not considered a move, but rather a reborrow.
&mut Some(ref mut x) => *x,
&mut None => panic!(),
}
}

fn main() {
}

0 comments on commit 3cee9e2

Please sign in to comment.