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

Move some queries from rustc::ty to librustc_ty. #67780

Merged
merged 3 commits into from
Jan 16, 2020

Conversation

cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Jan 1, 2020

cc #65031

@rust-highfive
Copy link
Collaborator

r? @varkor

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 1, 2020
@Zoxc
Copy link
Contributor

Zoxc commented Jan 1, 2020

I think it would make sense to move this to a new rustc_ty crate. cc @rust-lang/compiler

@bors
Copy link
Contributor

bors commented Jan 2, 2020

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

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2020-01-05T15:57:40.8847512Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-01-05T15:57:40.9074951Z ##[command]git config gc.auto 0
2020-01-05T15:57:40.9140058Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-01-05T15:57:40.9203369Z ##[command]git config --get-all http.proxy
2020-01-05T15:57:40.9351315Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/67780/merge:refs/remotes/pull/67780/merge
---
2020-01-05T16:24:01.2867426Z Assembling stage1 compiler (x86_64-unknown-linux-gnu)
2020-01-05T16:24:01.2886861Z Building stage1 std artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2020-01-05T16:24:01.6879880Z    Compiling cc v1.0.47
2020-01-05T16:24:01.6880214Z    Compiling core v0.0.0 (/checkout/src/libcore)
2020-01-05T16:24:06.4571088Z error: internal compiler error: src/librustc/ty/query/mod.rs:96: `tcx.associated_item_def_ids(DefId(0:5925 ~ core[a1e0]::fmt[0]::Debug[0]))` unsupported by its crate
2020-01-05T16:24:06.4572342Z thread 'rustc' panicked at 'Box<Any>', src/librustc_errors/lib.rs:892:9
2020-01-05T16:24:06.4572439Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2020-01-05T16:24:06.4572626Z 
2020-01-05T16:24:06.4577822Z note: the compiler unexpectedly panicked. this is a bug.
2020-01-05T16:24:06.4577822Z note: the compiler unexpectedly panicked. this is a bug.
2020-01-05T16:24:06.4577956Z 
2020-01-05T16:24:06.4579060Z note: we would appreciate a bug report: ***/blob/master/CONTRIBUTING.md#bug-reports
2020-01-05T16:24:06.4579329Z 
2020-01-05T16:24:06.4580848Z note: rustc 1.42.0-nightly (179694ba8 2020-01-05) running on x86_64-unknown-linux-gnu
2020-01-05T16:24:06.4580895Z 
2020-01-05T16:24:06.4581420Z note: compiler flags: -Z external-macro-backtrace -Z binary-dep-depinfo -Z force-unstable-if-unmarked -C opt-level=2 -C codegen-units=1 -C debuginfo=0 -C link-args=-Wl,-rpath,$ORIGIN/../lib -C prefer-dynamic -C llvm-args=-import-instr-limit=10 -C debug-assertions=n --crate-type lib
2020-01-05T16:24:06.4581549Z note: some of the compiler flags provided by cargo are hidden
2020-01-05T16:24:06.4581581Z 
2020-01-05T16:24:06.4851204Z error: aborting due to previous error
2020-01-05T16:24:06.4851436Z 
---
2020-01-05T16:24:07.7672224Z   local time: Sun Jan  5 16:24:07 UTC 2020
2020-01-05T16:24:08.1820397Z   network time: Sun, 05 Jan 2020 16:24:08 GMT
2020-01-05T16:24:08.1831333Z == end clock drift check ==
2020-01-05T16:24:10.4063622Z 
2020-01-05T16:24:10.4161739Z ##[error]Bash exited with code '1'.
2020-01-05T16:24:10.4203578Z ##[section]Starting: Checkout
2020-01-05T16:24:10.4205759Z ==============================================================================
2020-01-05T16:24:10.4205820Z Task         : Get sources
2020-01-05T16:24:10.4205868Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

Comment on lines 222 to 231
//pub fn is_impl_trait_defn(tcx: TyCtxt<'_>, def_id: DefId) -> Option<DefId> {
// if let Some(hir_id) = tcx.hir().as_local_hir_id(def_id) {
// if let Node::Item(item) = tcx.hir().get(hir_id) {
// if let hir::ItemKind::OpaqueTy(ref opaque_ty) = item.kind {
// return opaque_ty.impl_trait_fn;
// }
// }
// }
// None
//}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

@cjgillot cjgillot force-pushed the passes-ty branch 2 times, most recently from f86b7d8 to 1be4d25 Compare January 6, 2020 08:15
@bors
Copy link
Contributor

bors commented Jan 6, 2020

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

@matthewjasper
Copy link
Contributor

Nominating for discussion of rustc_ty

@bors
Copy link
Contributor

bors commented Jan 8, 2020

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

@Zoxc
Copy link
Contributor

Zoxc commented Jan 13, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Jan 13, 2020

📌 Commit 9908a87 has been approved by Zoxc

@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 Jan 13, 2020
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2020-01-13T12:42:20.1002348Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-01-13T12:42:20.1108938Z ##[command]git config gc.auto 0
2020-01-13T12:42:20.1164327Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-01-13T12:42:20.1236961Z ##[command]git config --get-all http.proxy
2020-01-13T12:42:20.1401045Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/67780/merge:refs/remotes/pull/67780/merge
---
2020-01-13T13:08:55.3577288Z Assembling stage1 compiler (x86_64-unknown-linux-gnu)
2020-01-13T13:08:55.3612431Z Building stage1 std artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2020-01-13T13:08:55.6482075Z    Compiling cc v1.0.49
2020-01-13T13:08:55.6521563Z    Compiling core v0.0.0 (/checkout/src/libcore)
2020-01-13T13:09:00.3138950Z error: internal compiler error: src/librustc/ty/query/mod.rs:99: `tcx.associated_item_def_ids(DefId(0:5917 ~ core[6099]::fmt[0]::Debug[0]))` unsupported by its crate
2020-01-13T13:09:00.3140422Z thread 'rustc' panicked at 'Box<Any>', src/librustc_errors/lib.rs:872:9
2020-01-13T13:09:00.3140854Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2020-01-13T13:09:00.3141088Z 
2020-01-13T13:09:00.3144603Z note: the compiler unexpectedly panicked. this is a bug.
2020-01-13T13:09:00.3144603Z note: the compiler unexpectedly panicked. this is a bug.
2020-01-13T13:09:00.3146771Z 
2020-01-13T13:09:00.3147956Z note: we would appreciate a bug report: ***/blob/master/CONTRIBUTING.md#bug-reports
2020-01-13T13:09:00.3148232Z 
2020-01-13T13:09:00.3148892Z note: rustc 1.42.0-nightly (d4d5b3ad7 2020-01-13) running on x86_64-unknown-linux-gnu
2020-01-13T13:09:00.3149092Z 
2020-01-13T13:09:00.3149750Z note: compiler flags: -Z external-macro-backtrace -Z binary-dep-depinfo -Z force-unstable-if-unmarked -C opt-level=2 -C codegen-units=1 -C debuginfo=0 -C link-args=-Wl,-rpath,$ORIGIN/../lib -C prefer-dynamic -C llvm-args=-import-instr-limit=10 -C debug-assertions=n --crate-type lib
2020-01-13T13:09:00.3153404Z note: some of the compiler flags provided by cargo are hidden
2020-01-13T13:09:00.3153732Z 
2020-01-13T13:09:00.3403081Z error: aborting due to previous error
2020-01-13T13:09:00.3403761Z 
---
2020-01-13T13:09:01.8252248Z   local time: Mon Jan 13 13:09:01 UTC 2020
2020-01-13T13:09:02.1205336Z   network time: Mon, 13 Jan 2020 13:09:02 GMT
2020-01-13T13:09:02.1205453Z == end clock drift check ==
2020-01-13T13:09:03.6562252Z 
2020-01-13T13:09:03.6670261Z ##[error]Bash exited with code '1'.
2020-01-13T13:09:03.6925005Z ##[section]Starting: Checkout
2020-01-13T13:09:03.6927267Z ==============================================================================
2020-01-13T13:09:03.6927331Z Task         : Get sources
2020-01-13T13:09:03.6927384Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Zoxc
Copy link
Contributor

Zoxc commented Jan 13, 2020

@bors r-

@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 Jan 13, 2020
fn_like.asyncness()
}

pub fn provide(providers: &mut ty::query::Providers<'_>) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you need to call this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, sorry. Added a commit for that.

@cjgillot cjgillot changed the title Move some queries from rustc::ty to librustc_passes. Move some queries from rustc::ty to librustc_ty. Jan 13, 2020
@Zoxc
Copy link
Contributor

Zoxc commented Jan 13, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Jan 13, 2020

📌 Commit 894dc2d has been approved by Zoxc

@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 13, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 16, 2020
Move some queries from rustc::ty to librustc_ty.

cc rust-lang#65031
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 16, 2020
Move some queries from rustc::ty to librustc_ty.

cc rust-lang#65031
bors added a commit that referenced this pull request Jan 16, 2020
Rollup of 5 pull requests

Successful merges:

 - #67780 (Move some queries from rustc::ty to librustc_ty.)
 - #68096 (Clean up some diagnostics by making them more consistent)
 - #68223 (Use 3.6 instead of 3.5 in float fract() documentation)
 - #68265 (Fix some issue numbers of unstable features)
 - #68266 (Changed docs for f32 and f64.)

Failed merges:

 - #68204 (Use named fields for `{ast,hir}::ItemKind::Impl`)

r? @ghost
@bors bors merged commit 894dc2d into rust-lang:master Jan 16, 2020
@cjgillot cjgillot deleted the passes-ty branch January 16, 2020 19:43
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.

7 participants