diff options
| author | bors <bors@rust-lang.org> | 2017-03-11 05:41:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-03-11 05:41:41 +0000 |
| commit | 1727b2331740cb6fe684cf81b774e290eb875b6e (patch) | |
| tree | 9959a1db818c8149e66572d5d9619bd2a970cc3b /src/libstd/sys_common | |
| parent | 71c058b3054b373bd13f68cd85d8b45adcb5f7d5 (diff) | |
| parent | 3493d91a18389d7548fa4079069cf2a75b872a64 (diff) | |
| download | rust-1727b2331740cb6fe684cf81b774e290eb875b6e.tar.gz rust-1727b2331740cb6fe684cf81b774e290eb875b6e.zip | |
Auto merge of #40432 - alexcrichton:rollup, r=alexcrichton
Rollup of 38 pull requests - Successful merges: #39202, #39820, #39918, #39921, #40092, #40146, #40199, #40225, #40239, #40257, #40259, #40261, #40277, #40278, #40287, #40297, #40311, #40315, #40319, #40324, #40336, #40340, #40344, #40345, #40367, #40369, #40372, #40373, #40379, #40385, #40386, #40389, #40400, #40404, #40410, #40422, #40423, #40424 - Failed merges: #40220, #40329, #40426
Diffstat (limited to 'src/libstd/sys_common')
| -rw-r--r-- | src/libstd/sys_common/gnu/libbacktrace.rs | 3 | ||||
| -rw-r--r-- | src/libstd/sys_common/wtf8.rs | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/libstd/sys_common/gnu/libbacktrace.rs b/src/libstd/sys_common/gnu/libbacktrace.rs index 1ea5cca44c7..14c0e8699bc 100644 --- a/src/libstd/sys_common/gnu/libbacktrace.rs +++ b/src/libstd/sys_common/gnu/libbacktrace.rs @@ -105,9 +105,6 @@ extern "C" fn(data: *mut libc::c_void, msg: *const libc::c_char, errnum: libc::c_int); enum backtrace_state {} -#[link(name = "backtrace", kind = "static")] -#[cfg(all(not(test), not(cargobuild)))] -extern {} extern { fn backtrace_create_state(filename: *const libc::c_char, diff --git a/src/libstd/sys_common/wtf8.rs b/src/libstd/sys_common/wtf8.rs index 1d61181a4ee..b486d4ffda3 100644 --- a/src/libstd/sys_common/wtf8.rs +++ b/src/libstd/sys_common/wtf8.rs @@ -236,6 +236,11 @@ impl Wtf8Buf { self.bytes.reserve_exact(additional) } + #[inline] + pub fn shrink_to_fit(&mut self) { + self.bytes.shrink_to_fit() + } + /// Returns the number of bytes that this string buffer can hold without reallocating. #[inline] pub fn capacity(&self) -> usize { |