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.

Sign up for GitHub

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

Jump to bottom

Impl items have generics #55199

Merged
merged 2 commits into from
Oct 28, 2018
Merged

Impl items have generics #55199

merged 2 commits into from
Oct 28, 2018

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Oct 19, 2018

No description provided.

@rust-highfive
Copy link
Collaborator

r? @davidtwco

(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 Oct 19, 2018
@rust-highfive

This comment has been minimized.

Sign in to view
@rust-lang rust-lang deleted a comment from rust-highfive Oct 20, 2018
@rust-lang rust-lang deleted a comment from rust-highfive Oct 20, 2018
@davidtwco

This comment has been minimized.

Sign in to view
1 similar comment
@davidtwco
Copy link
Member

@bors r+

@bors

This comment has been minimized.

Sign in to view
@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 Oct 23, 2018
bjorn3
bjorn3 requested changes Oct 24, 2018
View reviewed changes
src/librustc_mir/const_eval.rs Outdated
@@ -525,7 +525,8 @@ pub fn const_eval_provider<'a, 'tcx>(
tcx: TyCtxt<'a, 'tcx, 'tcx>,
key: ty::ParamEnvAnd<'tcx, GlobalId<'tcx>>,
) -> ::rustc::mir::interpret::ConstEvalResult<'tcx> {
trace!("const eval: {:?}", key);
trace!("const eval: {}", key.value.instance);
trace!("const eval key: {:?}", key);
Copy link
Member

Choose a reason for hiding this comment

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

Why trace both key and key.value.instance?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because the printing via Display of the instance goes through the code that was ICEing here before

Copy link
Member

Choose a reason for hiding this comment

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

Get it

@bors

This comment has been minimized.

Sign in to view
@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 Oct 26, 2018
@RalfJung
Copy link
Member

You just rebased, right? So we can r=davidtwco again?

Cc @davidtwco

@davidtwco
Copy link
Member

Thanks @RalfJung. Wish GitHub would email on pushes.

@bors r+

@bors

This comment has been minimized.

Sign in to view
@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 Oct 26, 2018
@bors

This comment has been minimized.

Sign in to view
@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 Oct 26, 2018
@oli-obk
Copy link
Contributor Author

oli-obk commented Oct 26, 2018

rebased again, and added a comment about what's going on

@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 26, 2018

📌 Commit 5a48f20 has been approved by davidtwco

@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 Oct 26, 2018
@bors
Copy link
Contributor

bors commented Oct 28, 2018

⌛ Testing commit 5a48f20 with merge 432e9f370d86b3212d1a153c263c946e979d9314...

@bors
Copy link
Contributor

bors commented Oct 28, 2018

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 28, 2018
@davidtwco
Copy link
Member

@bors retry

@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 Oct 28, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Oct 28, 2018
@kennytm
Rollup merge of rust-lang#55199 - oli-obk:instance_printing, r=davidtwco
db4e77c 
Impl items have generics
@kennytm kennytm mentioned this pull request Oct 28, 2018
Merged
bors added a commit that referenced this pull request Oct 28, 2018
@bors
Auto merge of #55433 - kennytm:rollup, r=kennytm
d492c67 
Rollup of 11 pull requests

Successful merges:

 - #55148 (Implement FromStr for PathBuf)
 - #55185 (path suggestions in Rust 2018 should point out the change in semantics)
 - #55191 (Fix sub-variant doc display)
 - #55199 (Impl items have generics)
 - #55244 (Don't rerun MIR passes when inlining)
 - #55252 (Add MaybeUninit::new)
 - #55257 (Allow extern statics with an extern type)
 - #55389 (Remove unnecessary mut in iterator.find_map documentation example, R…)
 - #55406 (Update string.rs)
 - #55412 (Fix an ICE in the min_const_fn analysis)
 - #55421 (Add ManuallyDrop::take)
@bors bors merged commit 5a48f20 into rust-lang:master Oct 28, 2018
@RalfJung RalfJung mentioned this pull request Oct 29, 2018
Closed
@oli-obk oli-obk deleted the instance_printing branch June 15, 2020 15:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjorn3 bjorn3 bjorn3 requested changes

Assignees

@davidtwco davidtwco

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@oli-obk @rust-highfive @davidtwco @bors @RalfJung @bjorn3