diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 11:53:49 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 11:53:49 -0800 |
| commit | 886c6f3534e6f03916eeff2ea8b235e85dd04b42 (patch) | |
| tree | 616ec48db83b768a4be84225bed9b0c0f730072d /src/libstd/ffi | |
| parent | 036d8c41897099b5822eafa40e3f1fd2cdc4a92a (diff) | |
| parent | 537889aa78c984ee6484d16fec4a67f35778aec6 (diff) | |
| download | rust-886c6f3534e6f03916eeff2ea8b235e85dd04b42.tar.gz rust-886c6f3534e6f03916eeff2ea8b235e85dd04b42.zip | |
rollup merge of #21258: aturon/stab-3-index
Conflicts: src/libcore/ops.rs src/librustc_typeck/astconv.rs src/libstd/io/mem.rs src/libsyntax/parse/lexer/mod.rs
Diffstat (limited to 'src/libstd/ffi')
| -rw-r--r-- | src/libstd/ffi/c_str.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs index b7f4b070591..7d0e42e8e49 100644 --- a/src/libstd/ffi/c_str.rs +++ b/src/libstd/ffi/c_str.rs @@ -115,7 +115,7 @@ impl Deref for CString { type Target = [libc::c_char]; fn deref(&self) -> &[libc::c_char] { - self.inner.slice_to(self.inner.len() - 1) + &self.inner[..(self.inner.len() - 1)] } } |
