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

Rename syntax_pos to rustc_span in source code #67763

Merged
merged 1 commit into from
Jan 1, 2020

Conversation

petrochenkov
Copy link
Contributor

Follow-up to #67707.

r? @Centril

@Centril
Copy link
Contributor

Centril commented Dec 31, 2019

@bors r+ rollup=never p=4 (bitrotty)

@bors
Copy link
Contributor

bors commented Dec 31, 2019

📌 Commit 762f46d37dd0bc3465669d1db3563b6b0a17ff02 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 31, 2019
@bors
Copy link
Contributor

bors commented Dec 31, 2019

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

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 31, 2019
@petrochenkov
Copy link
Contributor Author

@bors r=Centril

@bors
Copy link
Contributor

bors commented Dec 31, 2019

📌 Commit 0561dfc44d96bf51c2f8c0d73a736d5b3a0758dd has been approved by Centril

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 31, 2019
@bors
Copy link
Contributor

bors commented Dec 31, 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 crateren2 (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 crateren2 --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/librustc_typeck/lib.rs
Auto-merging src/librustc_typeck/check/pat.rs
Auto-merging src/librustc_typeck/check/mod.rs
Auto-merging src/librustc_typeck/check/demand.rs
CONFLICT (content): Merge conflict in src/librustc_typeck/check/demand.rs
Auto-merging src/librustc_typeck/check/_match.rs
Auto-merging src/librustc_resolve/lib.rs
Auto-merging src/librustc_resolve/Cargo.toml
CONFLICT (content): Merge conflict in src/librustc_resolve/Cargo.toml
Auto-merging src/librustc_parse/parser/ty.rs
Auto-merging src/librustc_parse/parser/stmt.rs
Auto-merging src/librustc_parse/parser/path.rs
Auto-merging src/librustc_parse/parser/pat.rs
Auto-merging src/librustc_parse/parser/module.rs
Auto-merging src/librustc_parse/parser/mod.rs
Auto-merging src/librustc_parse/parser/item.rs
Auto-merging src/librustc_parse/parser/expr.rs
Auto-merging src/librustc_parse/parser/diagnostics.rs
Auto-merging src/librustc_parse/parser/attr.rs
Auto-merging src/librustc_parse/lexer/mod.rs
Auto-merging src/librustc_lint/types.rs
CONFLICT (content): Merge conflict in src/librustc_lint/types.rs
Auto-merging src/librustc_interface/passes.rs
Auto-merging src/librustc_interface/Cargo.toml
Auto-merging src/librustc_expand/proc_macro_server.rs
Auto-merging src/librustc_expand/mbe/macro_parser.rs
Auto-merging src/librustc_ast_lowering/lib.rs
CONFLICT (content): Merge conflict in src/librustc_ast_lowering/lib.rs
Auto-merging src/librustc_ast_lowering/item.rs
CONFLICT (content): Merge conflict in src/librustc_ast_lowering/item.rs
Auto-merging src/librustc/traits/mod.rs
Auto-merging src/librustc/traits/error_reporting.rs
Auto-merging src/librustc/infer/error_reporting/mod.rs
Auto-merging src/librustc/hir/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 31, 2019
@bors
Copy link
Contributor

bors commented Dec 31, 2019

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

@petrochenkov
Copy link
Contributor Author

@bors r=Centril

@bors
Copy link
Contributor

bors commented Jan 1, 2020

📌 Commit 70f1d57 has been approved by Centril

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 1, 2020
@bors
Copy link
Contributor

bors commented Jan 1, 2020

⌛ Testing commit 70f1d57 with merge 9e6fb53...

bors added a commit that referenced this pull request Jan 1, 2020
Rename `syntax_pos` to `rustc_span` in source code

Follow-up to #67707.

r? @Centril
@bors
Copy link
Contributor

bors commented Jan 1, 2020

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 9e6fb53 to master...

bors added a commit that referenced this pull request Mar 1, 2020
Rename `libsyntax` to `librustc_ast`

This was the last rustc crate that wasn't following the `rustc_*` naming convention.

Follow-up to #67763.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants