(WIP) Small fixes in chalkification #58305
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
|
☔ The latest upstream changes (presumably #58316) made this pull request unmergeable. Please resolve the merge conflicts. |
scalexm
force-pushed
the
chalk-continued
branch
from
fce63d8 to
84aeb45
Compare
|
Ping from triage @nikomatsakis :) |
|
☔ The latest upstream changes (presumably #58321) made this pull request unmergeable. Please resolve the merge conflicts. |
|
☔ The latest upstream changes (presumably #59178) made this pull request unmergeable. Please resolve the merge conflicts. |
nikomatsakis
force-pushed
the
chalk-continued
branch
from
8decbc5 to
35a36ad
Compare
Some where clauses were not subtituted for generic bound type vars.
scalexm
force-pushed
the
chalk-continued
branch
from
6e08720 to
da75625
Compare
nikomatsakis
approved these changes
Mar 20, 2019
src/librustc/infer/nll_relate/mod.rs
Outdated
| @@ -436,7 +564,12 @@ where | |||
| (_, &ty::Projection(projection_ty)) | |||
| if D::normalization() == NormalizationStrategy::Lazy => | |||
| { | |||
| Ok(self.relate_projection_ty(projection_ty, a)) | |||
| // Swap the respective scopes of `a` and `b` (see comment | |||
| // above). <-- FIXME do the scopes matter to `relate_projection_ty`? I think not..? | |||
There was a problem hiding this comment.
Should we remove these lines?
scalexm
force-pushed
the
chalk-continued
branch
from
da75625 to
ca5a212
Compare
|
@bors r=nikomatsakis |
|
📌 Commit ca5a212 has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit ca5a212 with merge 1eaa43ef73878fe214783e4b0d74de02d9ecea7c... |
|
💔 Test failed - checks-travis |
bors
added
S-waiting-on-review
|
The job Click to expand the log.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 |
|
Hmm |
|
Probably worth a retry |
Centril
reviewed
Mar 23, 2019
| /// Relate a type inference variable with a value type. This works | ||
| /// by creating a "generalization" G of the value where all the | ||
| /// lifetimes are replaced with fresh inference values. This | ||
| /// genearlization G becomes the value of the inference variable, |
There was a problem hiding this comment.
Suggested change
| /// genearlization G becomes the value of the inference variable, | |
| /// generalization G becomes the value of the inference variable, |
|
@bors retry |
bors
added
S-waiting-on-bors
|
⌛ Testing commit ca5a212 with merge 943f65a043a2baca419c66721d161392f45fccf2... |
|
💔 Test failed - checks-travis |
bors
added
S-waiting-on-review
|
The job Click to expand the log.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 |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Mar 24, 2019
(WIP) Small fixes in chalkification
Small fixes around region constraints and builtin impls. There are still some type inference errors, for example the following code errors out:
```rust
fn main() {
let mut x: Vec<i32> = Vec::new();
// ^^^^^^^^ cannot infer type for `std::vec::Vec<_>`
}
```
but explicitly specifying `Vec::<i32>::new` works.
With these few fixes, the following code now passes type-checking:
```rust
fn main() {
let mut x: Vec<i32> = Vec::<i32>::new();
x.push(5);
println!("{:?}", x);
}
```
I also fixed the implied bounds bug as discussed on Zulip and in rust-lang/chalk#206
cc @tmandry
r? @nikomatsakis
|
☀️ Test successful - checks-travis, status-appveyor |
This was referenced Mar 24, 2019
tmandry
added
the
WG-traits
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Small fixes around region constraints and builtin impls. There are still some type inference errors, for example the following code errors out:
but explicitly specifying
Vec::<i32>::newworks.With these few fixes, the following code now passes type-checking:
I also fixed the implied bounds bug as discussed on Zulip and in rust-lang/chalk#206
cc @tmandry
r? @nikomatsakis