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

Fixed #48425 : Various functions taking a TyCtxt and a Span should be taking a TyCtxtAt #48651

Merged
merged 1 commit into from
Mar 8, 2018

Conversation

PramodBisht
Copy link
Contributor

Hi @oli-obk
I have done some code refactoring to fix #48425, Please let me know if anything else is required on this.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 2, 2018
@PramodBisht
Copy link
Contributor Author

Fixing conflicts.

@PramodBisht PramodBisht changed the title Fixed #48425 Fixed #48425 : Various functions taking a TyCtxt and a Span should be taking a TyCtxtAt Mar 2, 2018
@oli-obk
Copy link
Contributor

oli-obk commented Mar 2, 2018

r? @oli-obk

@nikomatsakis can you add me to the list of ppl who can give bors commands? I can't do that yet, even though I can be assigned as a reviewer

@rust-highfive rust-highfive assigned oli-obk and unassigned nikomatsakis Mar 2, 2018
@oli-obk
Copy link
Contributor

oli-obk commented Mar 2, 2018

@PramodBisht please squash the commits into one. You can do that with git rebase -i origin/master and git push --force-with-lease afterwards. The code lgtm

r=me with commits squashed

@hanna-kruppe
Copy link
Contributor

hanna-kruppe commented Mar 2, 2018

@bors delegate=oli-obk

@bors
Copy link
Contributor

bors commented Mar 2, 2018

✌️ @oli-obk can now approve this pull request

2 similar comments
@bors
Copy link
Contributor

bors commented Mar 2, 2018

✌️ @oli-obk can now approve this pull request

@bors
Copy link
Contributor

bors commented Mar 2, 2018

✌️ @oli-obk can now approve this pull request

@PramodBisht
Copy link
Contributor Author

@oli-obk I am not able to rebase it because of merge commits, is there any other way around to deal with that. Let me know if I should recommit and raise PR from another branch.

@oli-obk
Copy link
Contributor

oli-obk commented Mar 2, 2018

Huh? Merge commits shouldn't matter. Can you paste the entire error?

@PramodBisht
Copy link
Contributor Author

@oli-obk can you come on IRC, can we discuss there?

@PramodBisht
Copy link
Contributor Author

@oli-obk right after running git rebase -i origin/master, I am getting this

error: could not apply 4882331... Fixed #48425

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
Could not apply 4882331b3772958718986e4ecbf70eb34e3a2fb2... Fixed #48425

master is in sync with main rust-lang/rust master

@oli-obk
Copy link
Contributor

oli-obk commented Mar 2, 2018

Sorry I'm on vacation. This is perfectly normal. Just look through the changes, remove all the things you did not change, git add the final document and then run git rebase --continue if anything is out of order, change it and run git commit --amend

@nikomatsakis
Copy link
Contributor

@oli-obk hmm. you ought to have them soon. =)

@PramodBisht
Copy link
Contributor Author

PramodBisht commented Mar 4, 2018

@oli-obk All set, could you please check again :)

@oli-obk
Copy link
Contributor

oli-obk commented Mar 4, 2018

Jup looks good now

@bors r+

@bors
Copy link
Contributor

bors commented Mar 4, 2018

📌 Commit 6fdf637 has been approved by oli-obk

@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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 4, 2018
Manishearth added a commit to Manishearth/rust that referenced this pull request Mar 5, 2018
Fixed rust-lang#48425 : Various functions taking a `TyCtxt` and a `Span` should be taking a `TyCtxtAt`

Hi @oli-obk
I have done some code refactoring to fix rust-lang#48425, Please let me know if anything else is required on this.
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 7, 2018
Fixed rust-lang#48425 : Various functions taking a `TyCtxt` and a `Span` should be taking a `TyCtxtAt`

Hi @oli-obk
I have done some code refactoring to fix rust-lang#48425, Please let me know if anything else is required on this.
bors added a commit that referenced this pull request Mar 7, 2018
Rollup of 9 pull requests

- Successful merges: #48511, #48549, #48618, #48624, #48651, #48698, #48778, #48787, #48802
- Failed merges: #48669, #48710
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 7, 2018
Fixed rust-lang#48425 : Various functions taking a `TyCtxt` and a `Span` should be taking a `TyCtxtAt`

Hi @oli-obk
I have done some code refactoring to fix rust-lang#48425, Please let me know if anything else is required on this.
bors added a commit that referenced this pull request Mar 7, 2018
Rollup of 9 pull requests

- Successful merges: #48511, #48549, #48618, #48624, #48651, #48698, #48778, #48787, #48802
- Failed merges: #48669, #48710
bors added a commit that referenced this pull request Mar 7, 2018
Rollup of 9 pull requests

- Successful merges: #48511, #48549, #48618, #48624, #48651, #48698, #48778, #48787, #48802
- Failed merges: #48669, #48710
@alexcrichton alexcrichton merged commit 6fdf637 into rust-lang:master Mar 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

Various functions taking a TyCtxt and a Span should be taking a TyCtxtAt
7 participants