bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #22502: nikomatsakis/deprecate-bracket-bracket

Browse source 
Conflicts:
	src/libcollections/slice.rs
	src/libcollections/str.rs
	src/librustc/middle/lang_items.rs
	src/librustc_back/rpath.rs
	src/librustc_typeck/check/regionck.rs
	src/libstd/ffi/os_str.rs
	src/libsyntax/diagnostic.rs
	src/libsyntax/parse/parser.rs
	src/libsyntax/util/interner.rs
	src/test/run-pass/regions-refcell.rs
This commit is contained in:
Alex Crichton 2015-02-18 15:48:40 -08:00
commit 231eeaa35b
146 changed files with 895 additions and 882 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstd/path.rs
View file

@ -977,7 +977,7 @@ impl ops::Deref for PathBuf {
type Target = Path;
fn deref(&self) -> &Path {
unsafe { mem::transmute(&self.inner[]) }
unsafe { mem::transmute(&self.inner[..]) }
}
}
@ -1014,7 +1014,7 @@ impl cmp::Ord for PathBuf {
impl AsOsStr for PathBuf {
fn as_os_str(&self) -> &OsStr {
&self.inner[]
&self.inner[..]
}
}