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

Change std::kinds to std::markers; flatten std::kinds::marker #20607

Merged
merged 4 commits into from
Jan 7, 2015

Conversation

nrc
Copy link
Member

@nrc nrc commented Jan 6, 2015

And stabilise some of std::markers

r? @aturon

@alexcrichton
Copy link
Member

Nice! I had suggested the name marker to @aturon as well as we don't have a whole lot of plural modules (e.g. we renamed atomics to atomic), but I don't really have a strong preference either way.

Regardless though, could you mark the module itself as #![stable]? That'll just apply to the module name.

@aturon
Copy link
Member

aturon commented Jan 6, 2015

Thanks @nick29581! I also was hoping for std::marker -- I hope I didn't tell you the wrong name earlier. Seems like it should be pretty easy to revampt the patch with that instead using a script?

Otherwise LGTM!

@nrc
Copy link
Member Author

nrc commented Jan 6, 2015

Ah crap, I got confused between kinds::markers and std::marker and got them the wrong way round. But yeah, should be easy to fix

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Jan 7, 2015
Conflicts:
	src/libcore/array.rs
	src/libcore/cell.rs
	src/libcore/prelude.rs
	src/libstd/path/posix.rs
	src/libstd/prelude/v1.rs
	src/test/compile-fail/dst-sized-trait-param.rs
@alexcrichton alexcrichton merged commit 9f07d05 into rust-lang:master Jan 7, 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.

3 participants