Skip to content

auto: Code for new snapshot, adding/removing transitional stuff for de-recording #4805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 5, 2013
Merged

auto: Code for new snapshot, adding/removing transitional stuff for de-recording #4805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e22aa02
core/syntax: Add transitional code for pipes
catamorphism Jan 29, 2013
4e45d71
syntax: Make the pipe compiler stop generating set_buffer_ calls
catamorphism Jan 29, 2013
2f46b76
core/syntax: Staging fixes
catamorphism Feb 5, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions src/libcore/pipes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,9 @@ pub fn BufferHeader() -> BufferHeader {
// This is for protocols to associate extra data to thread around.
#[doc(hidden)]
#[cfg(stage0)]
type Buffer<T: Owned> = {
header: BufferHeader,
data: T,
};
#[doc(hidden)]
type Buffer<T> = { header: BufferHeader, data: T };
#[cfg(stage1)]
#[cfg(stage2)]
#[cfg(stage3)]
pub struct Buffer<T> {
header: BufferHeader,
data: T,
Expand Down Expand Up @@ -247,7 +242,6 @@ pub fn mk_packet<T: Owned>() -> Packet<T> {
payload: None,
}
}

#[doc(hidden)]
#[cfg(stage0)]
fn unibuffer<T: Owned>() -> ~Buffer<Packet<T>> {
Expand All @@ -267,7 +261,6 @@ fn unibuffer<T: Owned>() -> ~Buffer<Packet<T>> {
#[doc(hidden)]
#[cfg(stage1)]
#[cfg(stage2)]
#[cfg(stage3)]
fn unibuffer<T>() -> ~Buffer<Packet<T>> {
let b = ~Buffer {
header: BufferHeader(),
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/ext/pipes/pipec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ pub impl protocol: gen_init {
ext_cx.block(
self.states.map_to_vec(
|s| ext_cx.parse_stmt(
fmt!("data.%s.set_buffer_(buffer)",
fmt!("data.%s.set_buffer(buffer)",
s.name))),
ext_cx.parse_expr(
fmt!("::ptr::addr_of(&(data.%s))",
Expand Down