Skip to content

Refractor ty.kind -> ty.kind() and ty.flags -> ty.flags()#75077

Merged
bors merged 3 commits intorust-lang:masterfrom
LeSeulArtichaut:tys-kind
Sep 4, 2020
Merged

Refractor ty.kind -> ty.kind() and ty.flags -> ty.flags()#75077
bors merged 3 commits intorust-lang:masterfrom
LeSeulArtichaut:tys-kind

Conversation

@LeSeulArtichaut
Copy link
Contributor

@LeSeulArtichaut LeSeulArtichaut commented Aug 2, 2020

First step for the "shared library to represent Rust types" work (rust-lang/types-team#16).

This PR makes the TyS::kind field private and adds a kind() method to access it.
As noted on Zulip, this refractoring might require a MCP. I am perfectly fine with having to wait until MCP is accepted and resolving the conflicts that pop up afterwards.

r? @nikomatsakis

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

LeSeulArtichaut commented Aug 2, 2020

Oops, forgot about rustdoc...

@LeSeulArtichaut LeSeulArtichaut 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 2, 2020
@LeSeulArtichaut
Copy link
Contributor Author

LeSeulArtichaut commented Aug 3, 2020

Changed rustdoc and clippy

@LeSeulArtichaut LeSeulArtichaut added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 3, 2020
@bors
Copy link
Collaborator

bors commented Aug 4, 2020

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

@nikomatsakis
Copy link
Contributor

nikomatsakis commented Aug 4, 2020

Thanks @LeSeulArtichaut ! For some reason, I thought we had an MCP for this change, but I guess we don't.

@nikomatsakis
Copy link
Contributor

nikomatsakis commented Aug 4, 2020

I do feel like that's appropriate, I can file one

@nikomatsakis nikomatsakis mentioned this pull request Aug 5, 2020
Closed
3 tasks
@nikomatsakis
Copy link
Contributor

nikomatsakis commented Aug 5, 2020

Opened rust-lang/compiler-team#341

@LeSeulArtichaut LeSeulArtichaut force-pushed the tys-kind branch 2 times, most recently from ffd573e to 50176d0 Compare August 5, 2020 21:09
@LeSeulArtichaut LeSeulArtichaut changed the title Refractor ty.kind -> ty.kind() Refractor ty.kind -> ty.kind() and ty.flags -> ty.flags() Aug 6, 2020
@LeSeulArtichaut LeSeulArtichaut added S-waiting-on-fcp Status: PR is in FCP and is awaiting for FCP to complete. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 7, 2020
@bors
Copy link
Collaborator

bors commented Aug 8, 2020

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

@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 8, 2020
@jackh726
Copy link
Member

jackh726 commented Aug 14, 2020

We should probably do a perf run on this too?

@LeSeulArtichaut
Copy link
Contributor Author

LeSeulArtichaut commented Aug 14, 2020

@jackh726 do I need to resolve the conflicts if you want to do a perf run?

@jackh726
Copy link
Member

jackh726 commented Aug 14, 2020

I think we can do a try/perf run without rebasing, but I don't have perms for that. I'll make a post on Zulip.

@lqd
Copy link
Member

lqd commented Aug 14, 2020

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

rust-timer commented Aug 14, 2020

Awaiting bors try build completion

@bors
Copy link
Collaborator

bors commented Aug 14, 2020

🔒 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 tys-kind (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 tys-kind --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/tools/clippy/clippy_lints/src/utils/mod.rs
Auto-merging src/tools/clippy/clippy_lints/src/transmute.rs
Auto-merging src/tools/clippy/clippy_lints/src/shadow.rs
Auto-merging src/tools/clippy/clippy_lints/src/ranges.rs
Auto-merging src/tools/clippy/clippy_lints/src/ptr.rs
Auto-merging src/tools/clippy/clippy_lints/src/needless_pass_by_value.rs
Auto-merging src/tools/clippy/clippy_lints/src/methods/mod.rs
Auto-merging src/tools/clippy/clippy_lints/src/loops.rs
Auto-merging src/tools/clippy/clippy_lints/src/functions.rs
Auto-merging src/tools/clippy/clippy_lints/src/doc.rs
Auto-merging src/tools/clippy/clippy_lints/src/derive.rs
CONFLICT (content): Merge conflict in src/tools/clippy/clippy_lints/src/derive.rs
Auto-merging src/tools/clippy/clippy_lints/src/default_trait_access.rs
Auto-merging src/tools/clippy/clippy_lints/src/consts.rs
Auto-merging src/tools/clippy/clippy_lints/src/bytecount.rs
Auto-merging src/librustdoc/passes/collect_intra_doc_links.rs
Auto-merging src/librustdoc/clean/utils.rs
Auto-merging src/librustdoc/clean/mod.rs
Auto-merging src/librustc_typeck/mem_categorization.rs
Auto-merging src/librustc_typeck/lib.rs
Auto-merging src/librustc_typeck/collect/type_of.rs
CONFLICT (content): Merge conflict in src/librustc_typeck/collect/type_of.rs
Auto-merging src/librustc_typeck/collect.rs
Auto-merging src/librustc_typeck/coherence/inherent_impls.rs
Auto-merging src/librustc_typeck/check/place_op.rs
Auto-merging src/librustc_typeck/check/pat.rs
Auto-merging src/librustc_typeck/check/mod.rs
Auto-merging src/librustc_typeck/check/method/probe.rs
Auto-merging src/librustc_typeck/check/dropck.rs
Auto-merging src/librustc_typeck/check/demand.rs
Auto-merging src/librustc_typeck/check/cast.rs
Auto-merging src/librustc_typeck/astconv.rs
Auto-merging src/librustc_ty/ty.rs
Auto-merging src/librustc_traits/chalk/db.rs
Auto-merging src/librustc_trait_selection/traits/select/mod.rs
Auto-merging src/librustc_trait_selection/traits/query/normalize.rs
CONFLICT (content): Merge conflict in src/librustc_trait_selection/traits/query/normalize.rs
Auto-merging src/librustc_trait_selection/traits/project.rs
CONFLICT (content): Merge conflict in src/librustc_trait_selection/traits/project.rs
Auto-merging src/librustc_trait_selection/traits/error_reporting/suggestions.rs
Auto-merging src/librustc_trait_selection/traits/auto_trait.rs
Auto-merging src/librustc_save_analysis/lib.rs
Auto-merging src/librustc_privacy/lib.rs
Auto-merging src/librustc_passes/liveness.rs
Auto-merging src/librustc_passes/dead.rs
Auto-merging src/librustc_mir_build/build/mod.rs
Auto-merging src/librustc_mir_build/build/matches/test.rs
Auto-merging src/librustc_mir/transform/validate.rs
Auto-merging src/librustc_mir/transform/rustc_peek.rs
Auto-merging src/librustc_mir/transform/qualify_min_const_fn.rs
Auto-merging src/librustc_mir/transform/promote_consts.rs
Auto-merging src/librustc_mir/transform/const_prop.rs
Auto-merging src/librustc_mir/transform/add_retag.rs
Auto-merging src/librustc_mir/monomorphize/polymorphize.rs
Auto-merging src/librustc_mir/interpret/validity.rs
Auto-merging src/librustc_mir/interpret/place.rs
Auto-merging src/librustc_mir/interpret/operand.rs
Auto-merging src/librustc_mir/interpret/eval_context.rs
Auto-merging src/librustc_mir/const_eval/eval_queries.rs
Auto-merging src/librustc_mir/borrow_check/type_check/mod.rs
Auto-merging src/librustc_mir/borrow_check/mod.rs
Auto-merging src/librustc_mir/borrow_check/diagnostics/mod.rs
Auto-merging src/librustc_middle/ty/print/pretty.rs
Auto-merging src/librustc_middle/ty/mod.rs
Auto-merging src/librustc_middle/ty/layout.rs
Auto-merging src/librustc_middle/ty/context.rs
Auto-merging src/librustc_middle/traits/query.rs
Auto-merging src/librustc_metadata/rmeta/encoder.rs
Auto-merging src/librustc_lint/unused.rs
Auto-merging src/librustc_lint/types.rs
Auto-merging src/librustc_lint/builtin.rs
Auto-merging src/librustc_infer/infer/sub.rs
Auto-merging src/librustc_infer/infer/nll_relate/mod.rs
Auto-merging src/librustc_infer/infer/error_reporting/nice_region_error/static_impl_trait.rs
Auto-merging src/librustc_codegen_ssa/mir/place.rs
Auto-merging src/librustc_codegen_llvm/debuginfo/metadata.rs
Auto-merging src/librustc_codegen_llvm/consts.rs
Auto-merging src/librustc_codegen_llvm/builder.rs
Automatic merge failed; fix conflicts and then commit the result.

@jackh726
Copy link
Member

jackh726 commented Aug 14, 2020

@LeSeulArtichaut can you rebase?

@LeSeulArtichaut
Copy link
Contributor Author

LeSeulArtichaut commented Sep 4, 2020

All right, here we go
@bors r=nikomatsakis rollup=never

@bors
Copy link
Collaborator

bors commented Sep 4, 2020

📌 Commit 4d28a82 has been approved by nikomatsakis

@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 Sep 4, 2020
@bors
Copy link
Collaborator

bors commented Sep 4, 2020

⌛ Testing commit 4d28a82 with merge d245464...

@bors
Copy link
Collaborator

bors commented Sep 4, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: nikomatsakis
Pushing d245464 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 4, 2020
@bors bors merged commit d245464 into rust-lang:master Sep 4, 2020
@rust-highfive rust-highfive mentioned this pull request Sep 4, 2020
Closed
@rust-highfive
Copy link
Contributor

rust-highfive commented Sep 4, 2020

📣 Toolstate changed by #75077!

Tested on commit d245464.
Direct link to PR: #75077

💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).

@rustbot rustbot added this to the 1.48.0 milestone Sep 4, 2020
rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Sep 4, 2020
@rust-highfive
📣 Toolstate changed by rust-lang/rust#75077!
03e6be3 
Tested on commit rust-lang/rust@d245464.
Direct link to PR: <rust-lang/rust#75077>

💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
This was referenced Sep 4, 2020
Merged
Merged
Merged
Merged
Merged
Merged
@LeSeulArtichaut LeSeulArtichaut deleted the tys-kind branch September 4, 2020 19:38
@LeSeulArtichaut LeSeulArtichaut mentioned this pull request Sep 4, 2020
Merged
bors added a commit to rust-lang/miri that referenced this pull request Sep 4, 2020
@bors
Auto merge of #1534 - LeSeulArtichaut:tys-kind, r=RalfJung
5f1182d 
Change `ty.kind` -> `ty.kind()`

This fixes build failure due to rust-lang/rust#75077, cc rust-lang/rust#76337.
(This is my first PR here, please tell me if anything's wrong)
Xanewok added a commit to Xanewok/rust-semverver that referenced this pull request Nov 18, 2020
@Xanewok
Fix breakage due to rust-lang/rust#75077
874d37d 
See rust-lang/rust#75077
Xanewok added a commit to Xanewok/rust-semverver that referenced this pull request Nov 18, 2020
@Xanewok
Fix breakage due to rust-lang/rust#75077
05f98db 
See rust-lang/rust#75077
Xanewok added a commit to Xanewok/rust-semverver that referenced this pull request Nov 19, 2020
@Xanewok
Fix breakage due to rust-lang/rust#75077
ab23df5 
See rust-lang/rust#75077
Xanewok added a commit to Xanewok/rust-semverver that referenced this pull request Nov 19, 2020
@Xanewok
Fix breakage due to rust-lang/rust#75077
91be2a8 
See rust-lang/rust#75077
Xanewok added a commit to Xanewok/rust-semverver that referenced this pull request Nov 19, 2020
@Xanewok
Fix breakage due to rust-lang/rust#75077
ee9d092 
See rust-lang/rust#75077
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

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

Milestone

1.48.0

Development

Successfully merging this pull request may close these issues.