Skip to content

Fixes #141 #142

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
May 29, 2018
Merged

Fixes #141 #142

merged 4 commits into from
May 29, 2018

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented May 23, 2018

mark-i-m
mark-i-m approved these changes May 23, 2018
View reviewed changes
Copy link
Member

@mark-i-m mark-i-m left a comment

Choose a reason for hiding this comment

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

Thanks!

@mark-i-m
Copy link
Member

Actually, could you also add a bit on the run-rustfix header command and .fixed files?

@oli-obk
Copy link
Contributor Author

oli-obk commented May 23, 2018

I have never used that personally and I'm not sure if it already works correctly (for some definition of correctly)

cc @killercup

@killercup
Copy link
Member

@oli-obk that works -- if you add // run-rustfix to a UI test, it'll pass the collected suggestions to rustfix to apply them to the source file, and then compare the result to the .fixed file (source), and try to compile the fixed file again (source).

@mark-i-m
Copy link
Member

Ping @oli-obk

mark-i-m
mark-i-m suggested changes May 28, 2018
View reviewed changes
src/tests/adding.md
@@ -148,6 +148,9 @@ exhaustive. Header commands can generally be found by browsing the
`TestProps` structure found in [`header.rs`] from the compiletest
source.

* `run-rustfix` for UI tests, indicates that the test produces
structured suggestions, which are then applied and the final
Copy link
Member

Choose a reason for hiding this comment

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

Does it get compiled again? I think the output of rustfix is just compared against the .fixed file.

Copy link
Member

Choose a reason for hiding this comment

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

Yes, it gets compiled again

Copy link
Member

Choose a reason for hiding this comment

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

Ah, then @oli-obk, could you just add that the expected fixed code should be in .fixed? Then r=me

@oli-obk oli-obk merged commit 37f5f85 into master May 29, 2018
@oli-obk oli-obk deleted the oli-obk-patch-1 branch May 29, 2018 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@killercup killercup killercup left review comments

@mark-i-m mark-i-m mark-i-m requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@oli-obk @mark-i-m @killercup