Add a compiletest header for edition #51800
Merged
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
rust-highfive
added
the
S-waiting-on-review
|
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 |
nikomatsakis
requested changes
Jun 26, 2018
src/tools/compiletest/src/header.rs
Outdated
| ed @ "2015" | "2018" => Some(ed.to_owned()), | ||
| _ => None, | ||
| } | ||
| } |
There was a problem hiding this comment.
maybe we should just permit you to write anything here?
src/tools/compiletest/src/header.rs
Outdated
|
|
||
| fn parse_edition(&self, line: &str) -> Option<String> { | ||
| match line { | ||
| ed @ "2015" | "2018" => Some(ed.to_owned()), |
There was a problem hiding this comment.
also, maybe line.trim()? I don't think we'll have edition names w/ internal whitespace =)
src/tools/compiletest/src/runtest.rs
Outdated
| @@ -571,6 +571,10 @@ impl<'test> TestCx<'test> { | |||
|
|
|||
| rustc.args(self.split_maybe_args(&self.config.target_rustcflags)); | |||
| rustc.args(&self.props.compile_flags); | |||
| rustc.arg(&format!( | |||
There was a problem hiding this comment.
I would prefer more like
if let Some(e) = self.props.editions {
rustc.arg(&format!("--edition={}", e))
}this way we can test the compiler's default behavior
src/tools/compiletest/src/runtest.rs
Outdated
| @@ -1370,7 +1374,11 @@ impl<'test> TestCx<'test> { | |||
| .arg("-o") | |||
| .arg(out_dir) | |||
| .arg(&self.testpaths.file) | |||
| .args(&self.props.compile_flags); | |||
| .args(&self.props.compile_flags) | |||
| .arg(&format!( | |||
src/tools/compiletest/src/runtest.rs
Outdated
| @@ -1765,6 +1773,10 @@ impl<'test> TestCx<'test> { | |||
| } | |||
|
|
|||
| rustc.args(&self.props.compile_flags); | |||
| rustc.arg(&format!( | |||
There was a problem hiding this comment.
...and here. Maybe we want some helper method to make that nicer.
There was a problem hiding this comment.
I just made this behave as if the user passed compile-flags: --edition=2018 instead.
mark-i-m
force-pushed
the
edition2018compiletest
branch
from
eb4aba6 to
75d33cf
Compare
mark-i-m
changed the title
|
@nikomatsakis Ok so...
EDIT: I also squashed everything since the commit history was getting messy. |
nikomatsakis
approved these changes
Jun 27, 2018
| @@ -298,6 +298,10 @@ impl TestProps { | |||
| .extend(flags.split_whitespace().map(|s| s.to_owned())); | |||
| } | |||
|
|
|||
| if let Some(edition) = config.parse_edition(ln) { | |||
| self.compile_flags.push(format!("--edition={}", edition)); | |||
There was a problem hiding this comment.
ah, simple. seems good enough for now.
|
@bors r+ |
|
📌 Commit 75d33cf has been approved by |
bors
added
S-waiting-on-bors
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Jun 27, 2018
…nikomatsakis Add a compiletest header for edition r? @nikomatsakis Are the `-Zunstable-options` options needed in these tests? It looks like they aren't. If not, I can remove them.
bors
added a commit
that referenced
this pull request
Jun 27, 2018
Rollup of 7 pull requests Successful merges: - #49987 (Add str::split_ascii_whitespace.) - #50342 (Document round-off error in `.mod_euc()`-method, see issue #50179) - #51658 (Only do sanity check with debug assertions on) - #51799 (Lower case some feature gate error messages) - #51800 (Add a compiletest header for edition) - #51824 (Fix the error reference for LocalKey::try_with) - #51842 (Document that Layout::from_size_align does not allow align=0) Failed merges: r? @ghost
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.
r? @nikomatsakis
Are the
-Zunstable-optionsoptions needed in these tests? It looks like they aren't. If not, I can remove them.