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

Avoid more symbol interning #61035

Merged
merged 9 commits into from May 27, 2019

Conversation

Projects
None yet
7 participants
@nnethercote
Copy link
Contributor

commented May 22, 2019

@nnethercote nnethercote force-pushed the nnethercote:avoid-more-symbol-interning branch from 6ecb042 to 899720f May 22, 2019

@nnethercote

This comment has been minimized.

Copy link
Contributor Author

commented May 22, 2019

@bors try

@bors

This comment has been minimized.

Copy link
Contributor

commented May 22, 2019

⌛️ Trying commit 899720f with merge 87c7099...

bors added a commit that referenced this pull request May 22, 2019

Show resolved Hide resolved src/libsyntax/ext/build.rs Outdated
@bors

This comment has been minimized.

Copy link
Contributor

commented May 22, 2019

☀️ Try build successful - checks-travis
Build commit: 87c7099

@nnethercote

This comment has been minimized.

Copy link
Contributor Author

commented May 22, 2019

@rust-timer

This comment has been minimized.

Copy link

commented May 22, 2019

Success: Queued 87c7099 with parent 1cc822c, comparison URL.

@rust-timer

This comment has been minimized.

Copy link

commented May 22, 2019

Finished benchmarking try commit 87c7099: comparison url

@nnethercote nnethercote force-pushed the nnethercote:avoid-more-symbol-interning branch from 899720f to 8871a5c May 23, 2019

@nnethercote

This comment has been minimized.

Copy link
Contributor Author

commented May 23, 2019

@nnethercote nnethercote force-pushed the nnethercote:avoid-more-symbol-interning branch from 8871a5c to 39e5dea May 23, 2019

@petrochenkov

This comment has been minimized.

Copy link
Contributor

commented May 23, 2019

Changes to libsyntax/parse/literal.rs are going to conflict with #60965, which makes most of them as well, and also refactors literal.rs heavily.

I'd recommend to remove commits modifying it and then reapply the few remaining changes once #60965 lands.

Show resolved Hide resolved src/libsyntax/ast.rs Outdated
@bors

This comment has been minimized.

Copy link
Contributor

commented May 23, 2019

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

@nnethercote nnethercote force-pushed the nnethercote:avoid-more-symbol-interning branch from 39e5dea to 71920d3 May 24, 2019

@nnethercote

This comment has been minimized.

Copy link
Contributor Author

commented May 24, 2019

@petrochenkov: new code is up. I have addressed all your comments. One of the commits disappeared after rebasing on top of #60965.

@petrochenkov

This comment has been minimized.

Copy link
Contributor

commented May 24, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

commented May 24, 2019

📌 Commit 71920d3 has been approved by petrochenkov

@bors

This comment has been minimized.

Copy link
Contributor

commented May 26, 2019

📌 Commit ad45cd5 has been approved by petrochenkov

@bors

This comment has been minimized.

Copy link
Contributor

commented May 27, 2019

🔒 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 avoid-more-symbol-interning (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 avoid-more-symbol-interning --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
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@nnethercote nnethercote force-pushed the nnethercote:avoid-more-symbol-interning branch from ad45cd5 to 33a3206 May 27, 2019

@nnethercote

This comment has been minimized.

Copy link
Contributor Author

commented May 27, 2019

Rebased again.

@bors r=petrochenkov

@bors

This comment has been minimized.

Copy link
Contributor

commented May 27, 2019

📌 Commit 33a3206 has been approved by petrochenkov

@bors

This comment has been minimized.

Copy link
Contributor

commented May 27, 2019

⌛️ Testing commit 33a3206 with merge ab7cf71...

bors added a commit that referenced this pull request May 27, 2019

@bors

This comment has been minimized.

Copy link
Contributor

commented May 27, 2019

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

@bors bors added the merged-by-bors label May 27, 2019

@bors bors merged commit 33a3206 into rust-lang:master May 27, 2019

2 checks passed

Travis CI - Pull Request Build Passed
Details
homu Test successful
Details
@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented May 27, 2019

📣 Toolstate changed by #61035!

Tested on commit ab7cf71.
Direct link to PR: #61035

💔 rls on windows: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request May 27, 2019

📣 Toolstate changed by rust-lang/rust#61035!
Tested on commit rust-lang/rust@ab7cf71.
Direct link to PR: <rust-lang/rust#61035>

💔 rls on windows: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).

@nnethercote nnethercote deleted the nnethercote:avoid-more-symbol-interning branch May 27, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.