forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#22736 - nikomatsakis:issue-22382, r=eddyb
Apply borrowck to fns that appear in const declarations. Fixes rust-lang#22382. r? @eddyb
- Loading branch information
Showing
4 changed files
with
82 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
// Copyright 2014 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. | ||
|
||
// Check that we check fns appearing in constant declarations. | ||
// Issue #22382. | ||
|
||
const MOVE: fn(&String) -> String = { | ||
fn broken(x: &String) -> String { | ||
return *x //~ ERROR cannot move | ||
} | ||
broken | ||
}; | ||
|
||
fn main() { | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
// Copyright 2014 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. | ||
|
||
// Check that we check fns appearing in constant declarations. | ||
// Issue #22382. | ||
|
||
// How about mutating an immutable vector? | ||
const MUTATE: fn(&Vec<String>) = { | ||
fn broken(x: &Vec<String>) { | ||
x.push(format!("this is broken")); | ||
//~^ ERROR cannot borrow | ||
} | ||
broken | ||
}; | ||
|
||
fn main() { | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
// Copyright 2014 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. | ||
|
||
// Check that we check fns appearing in constant declarations. | ||
// Issue #22382. | ||
|
||
// Returning local references? | ||
struct DropString { | ||
inner: String | ||
} | ||
impl Drop for DropString { | ||
fn drop(&mut self) { | ||
self.inner.clear(); | ||
self.inner.push_str("dropped"); | ||
} | ||
} | ||
const LOCAL_REF: fn() -> &'static str = { | ||
fn broken() -> &'static str { | ||
let local = DropString { inner: format!("Some local string") }; | ||
return &local.inner; //~ ERROR does not live long enough | ||
} | ||
broken | ||
}; | ||
|
||
fn main() { | ||
} |