Skip to content

Commit b72ed55

Browse files
committed
core: Allow set_buffer_ to be referred to as set-buffer
After a snapshot, we can take out the set_buffer_ version (pipes syntax exts use it). As per #4421
1 parent a8ff9f2 commit b72ed55

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/libcore/gc.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ pub fn cleanup_stack_for_failure() {
347347

348348
if ptr::is_null(tydesc) {
349349
// FIXME #4420: Destroy this box
350+
// FIXME #4330: Destroy this box
350351
} else {
351352
rustrt::rust_call_tydesc_glue(*root, tydesc, 3 as size_t);
352353
}

src/libcore/pipes.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,17 @@ pub type Packet<T: Owned> = {
206206

207207
#[doc(hidden)]
208208
pub trait HasBuffer {
209-
// FIXME #4421: This should not have a trailing underscore
209+
fn set_buffer(b: *libc::c_void);
210+
// FIXME #4421 remove after snapshot
210211
fn set_buffer_(b: *libc::c_void);
211212
}
212213

213214
impl<T: Owned> Packet<T>: HasBuffer {
214-
fn set_buffer_(b: *libc::c_void) {
215+
fn set_buffer(b: *libc::c_void) {
215216
self.header.buffer = b;
216217
}
218+
// FIXME #4421 remove after snapshot
219+
fn set_buffer_(b: *libc::c_void) { self.set_buffer(b) }
217220
}
218221

219222
#[doc(hidden)]

0 commit comments

Comments
 (0)