dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some rebasing fallout.

This commit is contained in:
Michael Woerister 2017-11-06 10:35:52 +01:00
parent e546fea0a1
commit 8fcf3e33e4
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/test/mir-opt/issue-41110.rs
View File

@ -14,10 +14,9 @@ fn main() {
let x = S.other(S.id()); let x = S.other(S.id());
} }
// no_mangle and extern C to make sure this gets instantiated even in an // no_mangle to make sure this gets instantiated even in an executable.
// executable.
#[no_mangle] #[no_mangle]
pub extern "C" fn test() { pub fn test() {
let u = S; let u = S;
let mut v = S; let mut v = S;
drop(v); drop(v);

8
src/test/mir-opt/match_false_edges.rs
View File

@ -18,7 +18,9 @@ fn guard2(_:i32) -> bool {
true true
} }
fn full_tested_match() { // no_mangle to make sure this gets instantiated even in an executable.
#[no_mangle]
pub fn full_tested_match() {
let _ = match Some(42) { let _ = match Some(42) {
Some(x) if guard() => (1, x), Some(x) if guard() => (1, x),
Some(y) => (2, y), Some(y) => (2, y),
@ -26,7 +28,9 @@ fn full_tested_match() {
}; };
} }
fn full_tested_match2() { // no_mangle to make sure this gets instantiated even in an executable.
#[no_mangle]
pub fn full_tested_match2() {
let _ = match Some(42) { let _ = match Some(42) {
Some(x) if guard() => (1, x), Some(x) if guard() => (1, x),
None => (3, 3), None => (3, 3),