Skip to content
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.

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

Make Arc support DSTs #25458

Merged
merged 1 commit into from
May 17, 2015
Merged

Make Arc support DSTs #25458

merged 1 commit into from
May 17, 2015

Conversation

ftxqxd
Copy link
Contributor

@ftxqxd ftxqxd commented May 15, 2015

No description provided.

@rust-highfive
Copy link
Collaborator

r? @huonw

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

@huonw
Copy link
Member

huonw commented May 15, 2015

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
Copy link
Contributor

bors commented May 16, 2015

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

@ftxqxd
Copy link
Contributor Author

ftxqxd commented May 16, 2015

@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
Copy link
Member

huonw commented May 16, 2015

@bors r+

@bors
Copy link
Contributor

bors commented May 16, 2015

📌 Commit e840393 has been approved by huonw

@bors
Copy link
Contributor

bors commented May 17, 2015

⌛ Testing commit e840393 with merge 4f83c4b...

bors added a commit that referenced this pull request May 17, 2015
@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