mirror of
https://github.com/rust-lang/rust.git
synced 2025-02-13 23:42:56 +00:00
Fix a typecheck regression with constant borrowed pointers in patterns
Change the eqtype relationship to be a suptype relationship instead. Fixes #18350. Fixes #18352.
This commit is contained in:
parent
80e5fe1a56
commit
f16744ce52
@ -74,7 +74,7 @@ pub fn check_pat(pcx: &pat_ctxt, pat: &ast::Pat, expected: ty::t) {
|
|||||||
let const_did = tcx.def_map.borrow().get_copy(&pat.id).def_id();
|
let const_did = tcx.def_map.borrow().get_copy(&pat.id).def_id();
|
||||||
let const_pty = ty::lookup_item_type(tcx, const_did);
|
let const_pty = ty::lookup_item_type(tcx, const_did);
|
||||||
fcx.write_ty(pat.id, const_pty.ty);
|
fcx.write_ty(pat.id, const_pty.ty);
|
||||||
demand::eqtype(fcx, pat.span, expected, const_pty.ty);
|
demand::suptype(fcx, pat.span, expected, const_pty.ty);
|
||||||
}
|
}
|
||||||
ast::PatIdent(bm, ref path, ref sub) if pat_is_binding(&tcx.def_map, pat) => {
|
ast::PatIdent(bm, ref path, ref sub) if pat_is_binding(&tcx.def_map, pat) => {
|
||||||
let typ = fcx.local_ty(pat.span, pat.id);
|
let typ = fcx.local_ty(pat.span, pat.id);
|
||||||
|
22
src/test/run-pass/issue-18352.rs
Normal file
22
src/test/run-pass/issue-18352.rs
Normal file
@ -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.
|
||||||
|
|
||||||
|
const X: &'static str = "12345";
|
||||||
|
|
||||||
|
fn test(s: String) -> bool {
|
||||||
|
match s.as_slice() {
|
||||||
|
X => true,
|
||||||
|
_ => false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
assert!(test("12345".to_string()));
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user