Skip to content

Commit

Permalink
let-else: add tests for moved expressions, copy out of non-copy
Browse files Browse the repository at this point in the history
  • Loading branch information
cormacrelf committed Dec 13, 2021
1 parent 34a9819 commit 61bcd8d
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 0 deletions.
45 changes: 45 additions & 0 deletions src/test/ui/let-else/let-else-non-copy.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// run-pass
//
// This is derived from a change to compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs, in
// preparation for adopting let-else within the compiler (thanks @est31):
//
// ```
// - let place = if let mir::VarDebugInfoContents::Place(p) = var.value { p } else { continue };
// + let mir::VarDebugInfoContents::Place(place) = var.value else { continue };
// ```
//
// The move was due to mir::Place being Copy, but mir::VarDebugInfoContents not being Copy.

#![feature(let_else)]

#[derive(Copy, Clone)]
struct Copyable;

enum NonCopy {
Thing(Copyable),
#[allow(unused)]
Other,
}

struct Wrapper {
field: NonCopy,
}

fn let_else() {
let vec = vec![Wrapper { field: NonCopy::Thing(Copyable) }];
for item in &vec {
let NonCopy::Thing(_copyable) = item.field else { continue };
}
}

fn if_let() {
let vec = vec![Wrapper { field: NonCopy::Thing(Copyable) }];
for item in &vec {
let _copyable = if let NonCopy::Thing(copyable) = item.field { copyable } else { continue };
}
}

fn main() {
let_else();
if_let();
}
17 changes: 17 additions & 0 deletions src/test/ui/let-else/let-else-source-expr-nomove-pass.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// run-pass
// issue #89688

#![feature(let_else)]

fn example_let_else(value: Option<String>) {
let Some(inner) = value else {
println!("other: {:?}", value); // OK
return;
};
println!("inner: {}", inner);
}

fn main() {
example_let_else(Some("foo".into()));
example_let_else(None);
}

0 comments on commit 61bcd8d

Please sign in to comment.