move find_fn (which is not specific to foreign items) out of foreign_item

[RalfJung]

No description provided.

[RalfJung]

@bors r+

[bors]

📌 Commit 9dddbd4 has been approved by RalfJung

[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 shims (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 shims --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 src/shims/foreign_items.rs
CONFLICT (content): Merge conflict in src/shims/foreign_items.rs
Automatic merge failed; fix conflicts and then commit the result.

[bors]

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

[RalfJung]

@bors r+

[bors]

📌 Commit 7b702b9 has been approved by RalfJung

[bors]

⌛ Testing commit 7b702b9 with merge 10af387...

[bors]

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung
Pushing 10af387 to master...