Enable some fix tests on stable

[dwijnand]

No description provided.

[alexcrichton]

@bors: r+

[bors]

📌 Commit 008ab7203c5c41e28af26964dbb0b4b449458d94 has been approved by alexcrichton

[alexcrichton]

@bors: r+

[bors]

💡 This pull request was already approved, no need to approve it again.

• There's another pull request that is currently being tested, blocking this pull request: [beta] Remove fix::local_paths_no_fix, as crate_in_paths is getting stabilized. #6069

[bors]

📌 Commit 008ab7203c5c41e28af26964dbb0b4b449458d94 has been approved by alexcrichton

[bors]

☔ The latest upstream changes (presumably #6068) made this pull request unmergeable. Please resolve the merge conflicts.

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout enable-some-fix-tests (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self enable-some-fix-tests --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging tests/testsuite/fix.rs
CONFLICT (content): Merge conflict in tests/testsuite/fix.rs
Automatic merge failed; fix conflicts and then commit the result.

[dwijnand]

@bors r=alexcrichton (trust me, bot!)

[bors]

@dwijnand: 🔑 Insufficient privileges: Not in reviewers

[Mark-Simulacrum]

@bors r=alexcrichton

[bors]

📌 Commit a7b1c4e has been approved by alexcrichton

[bors]

⌛ Testing commit a7b1c4e with merge 35cd245...

[bors]

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 35cd245 to master...