b2eb88843d
the CFG for match statements. There were two bugs in issue #14684. One was simply that the borrow check didn't know about the correct CFG for match statements: the pattern must be a predecessor of the guard. This disallows the bad behavior if there are bindings in the pattern. But it isn't enough to prevent the memory safety problem, because of wildcards; thus, this patch introduces a more restrictive rule, which disallows assignments and mutable borrows inside guards outright. I discussed this with Niko and we decided this was the best plan of action. This breaks code that performs mutable borrows in pattern guards. Most commonly, the code looks like this: impl Foo { fn f(&mut self, ...) {} fn g(&mut self, ...) { match bar { Baz if self.f(...) => { ... } _ => { ... } } } } Change this code to not use a guard. For example: impl Foo { fn f(&mut self, ...) {} fn g(&mut self, ...) { match bar { Baz => { if self.f(...) { ... } else { ... } } _ => { ... } } } } Sometimes this can result in code duplication, but often it illustrates a hidden memory safety problem. Closes #14684. [breaking-change]
34 lines
942 B
Rust
34 lines
942 B
Rust
// 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.
|
|
|
|
enum Enum<'a> {
|
|
A(&'a int),
|
|
B(bool),
|
|
}
|
|
|
|
fn foo() -> int {
|
|
let mut n = 42;
|
|
let mut x = A(&mut n);
|
|
match x {
|
|
A(_) if { x = B(false); false } => 1,
|
|
//~^ ERROR cannot assign in a pattern guard
|
|
A(_) if { let y = &mut x; *y = B(false); false } => 1,
|
|
//~^ ERROR cannot mutably borrow in a pattern guard
|
|
//~^^ ERROR cannot assign in a pattern guard
|
|
A(p) => *p,
|
|
B(_) => 2,
|
|
}
|
|
}
|
|
|
|
fn main() {
|
|
foo();
|
|
}
|
|
|