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

Revert compiletest hacks, use latest compiletest #3927

Merged
merged 4 commits into from
Apr 7, 2019
Merged

Revert compiletest hacks, use latest compiletest #3927

merged 4 commits into from
Apr 7, 2019

Conversation

Manishearth
Copy link
Member

The libtest changes have been reverted, see rust-lang/rust#59766, Manishearth/compiletest-rs#174

@@ -74,12 +74,16 @@ fn run_mode(mode: &str, dir: PathBuf) {
compiletest::run_tests(&cfg);
}

#[warn(clippy::identity_conversion)]
fn run_ui_toml_tests(config: &compiletest::Config, mut tests: Vec<TestDescAndFn>) -> Result<bool, io::Error> {
#[allow(clippy::identity_conversion)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line should be removed completely (sometime). It's a bug that this lint started to trigger and therefore we set it to warn instead of deny for the dogfood test. #3913

If this bug still exists (which I think is the case) this line should stay unchanged.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It still exists :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remember, compile-test.rs is a different crate, so allow()s applied elsewhere will not help here.

@Manishearth
Copy link
Member Author

Hmm, appveyor fails (but not travis) on rustc_term issues...

@Manishearth
Copy link
Member Author

Ah we still depend on libtest

@Manishearth
Copy link
Member Author

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 7, 2019

📌 Commit 4c7c39a has been approved by Manishearth

bors added a commit that referenced this pull request Apr 7, 2019
Revert compiletest hacks, use latest compiletest

The libtest changes have been reverted, see rust-lang/rust#59766,  Manishearth/compiletest-rs#174
@bors
Copy link
Collaborator

bors commented Apr 7, 2019

⌛ Testing commit 4c7c39a with merge cffb416...

@bors
Copy link
Collaborator

bors commented Apr 7, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Manishearth
Pushing cffb416 to master...

@bors bors merged commit 4c7c39a into master Apr 7, 2019
@Manishearth Manishearth deleted the rustup branch April 7, 2019 21:22
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