add --edition option #50080
Merged
add --edition option #50080
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
klnusbaum
commented
Apr 19, 2018
src/librustc/session/config.rs
Outdated
| @@ -2422,6 +2427,11 @@ mod dep_tracking { | |||
| } | |||
| } | |||
|
|
|||
| pub fn edition_name_list() -> String { | |||
There was a problem hiding this comment.
Would really love some guidance here. This function really needs to return a &'static str but I'm not sure how to do that. Any thoughts?
There was a problem hiding this comment.
Must it return a 'static str? There's no way to do this without some unsafe code or hardcoding it.
There was a problem hiding this comment.
So the reason I think it needs to be 'static str is that on line 1646, opt::opt_s requires that the "valid options string" be of type &'static str. Is there some way to generate this String while:
- Not introducing something that needs to change whenever we add a new edition in the
libsyntax/edition.rsfile. - And generating a string that is of type
&'static str
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Manishearth
requested changes
Apr 19, 2018
src/librustc/session/config.rs
Outdated
| @@ -410,6 +412,7 @@ top_level_options!( | |||
|
|
|||
| // Remap source path prefixes in all output (messages, object files, debug, etc) | |||
| remap_path_prefix: Vec<(PathBuf, PathBuf)> [UNTRACKED], | |||
| edition: Edition [UNTRACKED], | |||
There was a problem hiding this comment.
I think this needs to be TRACKED?
this is for incremental compilation; changing this should probably force a recompile
There was a problem hiding this comment.
Ah, so that's the the TRACKED/UNTRACKED thing means. Cool. I'll change this.
src/librustc/session/config.rs
Outdated
| @@ -2422,6 +2427,11 @@ mod dep_tracking { | |||
| } | |||
| } | |||
|
|
|||
| pub fn edition_name_list() -> String { | |||
There was a problem hiding this comment.
Must it return a 'static str? There's no way to do this without some unsafe code or hardcoding it.
| Err(_) => early_error( | ||
| ErrorOutputType::default(), | ||
| &format!( | ||
| "argument for --edition must be one of: \ |
There was a problem hiding this comment.
We also need to handle stability here. If the picked edition is unstable, we should throw an error if the compiler is not nightly.
You can add a .stable() method to Edition that returns true for 2015.
There was a problem hiding this comment.
How do I know if the compiler is nightly?
kennytm
added
the
S-waiting-on-author
…e editions are allowed to be used on non-nightly builds
klnusbaum
commented
Apr 20, 2018
| } | ||
|
|
||
| // must be in order from oldest to newest | ||
| pub const ALL_EDITIONS: &[Edition] = &[Edition::Edition2015, Edition::Edition2018]; | ||
|
|
||
| pub const EDITION_NAME_LIST: &'static str = "2015|2018"; |
There was a problem hiding this comment.
I would really like to avoid introducing this. Would be great if we could derive it some way from something that already exists so we have one less thing to change when adding an edition.
There was a problem hiding this comment.
Using custom derives within libsyntax itself is annoying and tricky. We'd need to do a snapshot, I think.
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
(ping me when this is ready to review) |
|
Ah, it is, you just need to fix up some rustdoc code it seems. lmk when travis passes |
|
You also need to update some tests that use -Zedition |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
@bors r+ Hopefully Travis passes, if it doesn't, r- it? |
|
📌 Commit c8c9bf9 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Apr 21, 2018
add --edition option This adds an official `edition` flag to the rust compiler
|
☀️ Test successful - status-appveyor, status-travis |
|
Fix cargo to use this? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds an official
editionflag to the rust compiler