Skip to content

Make Arc support DSTs#25458

Merged
bors merged 1 commit into
rust-lang:masterfrom
ftxqxd:arc-dst
May 17, 2015
Merged

Make Arc support DSTs#25458
bors merged 1 commit into
rust-lang:masterfrom
ftxqxd:arc-dst

Conversation

@ftxqxd

@ftxqxd ftxqxd commented May 15, 2015

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @huonw

(rust_highfive has picked a reviewer for you, use r? to override)

@huonw

huonw commented May 15, 2015

Copy link
Copy Markdown
Contributor

I wonder if it will be clearer and easier to handle to just duplicate the whole file with the old code in arc_stage0.rs and something like in lib.rs

#[cfg_attr(stage0, path = "arc_stage0.rs")]
mod arc;

@bors

bors commented May 16, 2015

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #25460) made this pull request unmergeable. Please resolve the merge conflicts.

@ftxqxd

ftxqxd commented May 16, 2015

Copy link
Copy Markdown
Contributor Author

@huonw I’ve updated it to duplicate the whole file instead. The diff is significantly larger, but I think it is much clearer and it should make making a snapshot easier in any case.

#[cfg_attr] and #[path] don’t seem to mix very well (it seems that mod statements are expanded before cfg attributes are considered) so I instead created a private arc_stage0 module and pub used all its items inside a public arc wrapper module.

@huonw

huonw commented May 16, 2015

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented May 16, 2015

Copy link
Copy Markdown
Collaborator

📌 Commit e840393 has been approved by huonw

@bors

bors commented May 17, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e840393 with merge 4f83c4b...

bors added a commit that referenced this pull request May 17, 2015
@bors

bors commented May 17, 2015

Copy link
Copy Markdown
Collaborator

@bors bors merged commit e840393 into rust-lang:master May 17, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants