From c6ab5b0829febc13d231f4b1629eda42588785bb Mon Sep 17 00:00:00 2001 From: Brian Koropoff Date: Tue, 28 Oct 2014 00:01:23 -0700 Subject: [PATCH 1/2] Respect mut in &mut str in astconv Closes #17361 --- src/librustc/middle/typeck/astconv.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librustc/middle/typeck/astconv.rs b/src/librustc/middle/typeck/astconv.rs index 15e3ee4c8fad3..abdf1a26adff6 100644 --- a/src/librustc/middle/typeck/astconv.rs +++ b/src/librustc/middle/typeck/astconv.rs @@ -674,7 +674,7 @@ fn mk_pointer<'tcx, AC: AstConv<'tcx>, RS: RegionScope>( return constr(ty::mk_str(tcx)); } RPtr(r) => { - return ty::mk_str_slice(tcx, r, ast::MutImmutable); + return ty::mk_str_slice(tcx, r, a_seq_mutbl); } } } From 374da5b16daccf15872f939772e682001bf0da8a Mon Sep 17 00:00:00 2001 From: Brian Koropoff Date: Tue, 28 Oct 2014 00:03:02 -0700 Subject: [PATCH 2/2] Add regression test for issue #17361 --- src/test/run-pass/issue-17361.rs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/test/run-pass/issue-17361.rs diff --git a/src/test/run-pass/issue-17361.rs b/src/test/run-pass/issue-17361.rs new file mode 100644 index 0000000000000..fa38dcc198673 --- /dev/null +++ b/src/test/run-pass/issue-17361.rs @@ -0,0 +1,16 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Test that astconv doesn't forget about mutability of &mut str + +fn main() { + fn foo(_: &mut T) {} + let _f: fn(&mut str) = foo; +}