Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 7 pull requests #65896

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

Closed
wants to merge 21 commits into from
Closed

Rollup of 7 pull requests #65896

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
893ab67
Custom lifetime error for `impl` item doesn't conform to `trait`
estebank Oct 3, 2019
3e2bc19
review comments
estebank Oct 4, 2019
1e95b5c
Point at the trait item and tweak wording
estebank Oct 15, 2019
e383b7c
Make error apply only to impl/trait mismatch
estebank Oct 15, 2019
3aba2d0
Fix NLL test
estebank Oct 15, 2019
76b8fd8
Add long error explanation for E0587
GuillaumeGomez Oct 18, 2019
42a805e
Update ui tests
GuillaumeGomez Oct 18, 2019
6661db0
Correct handling of type flags with `ConstValue::Placeholder`
varkor Oct 20, 2019
2af50a9
Improve the "try using a variant of the expected type" hint.
Patryk27 Oct 18, 2019
97b10b7
Fix a previously forgotten pretty-printing test after a change to the…
Patryk27 Oct 26, 2019
1c5d0be
Improve pretty-printing for compound qualified paths.
Patryk27 Oct 27, 2019
e2c450b
doc: mention `get(_mut)` in Vec
tesuji Oct 28, 2019
cc575a6
rustc: use IndexVec<DefIndex, T> instead of Vec<T>.
eddyb Oct 25, 2019
46a39a2
self-profiling: Record something more useful for crate metadata gener…
michaelwoerister Oct 28, 2019
05ff8db
Rollup merge of #65068 - estebank:trait-impl-lt-mismatch, r=nikomatsakis
JohnTitor Oct 28, 2019
7ba2aa8
Rollup merge of #65562 - Patryk27:master, r=estebank
JohnTitor Oct 28, 2019
84cb9af
Rollup merge of #65563 - GuillaumeGomez:long-err-explanation-E0587, r…
JohnTitor Oct 28, 2019
4867ce4
Rollup merge of #65643 - varkor:remove-free-regions-from-const-placeh…
JohnTitor Oct 28, 2019
e1c36fd
Rollup merge of #65825 - eddyb:def-index-vec, r=varkor
JohnTitor Oct 28, 2019
ea3548b
Rollup merge of #65887 - lzutao:doc-vec-get, r=rkruppe
JohnTitor Oct 28, 2019
6d092ac
Rollup merge of #65891 - michaelwoerister:sp-crate-metadata, r=wesley…
JohnTitor Oct 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Correct handling of type flags with ConstValue::Placeholder
  • Loading branch information
@varkor
varkor committed Oct 25, 2019
commit 6661db006a85bdb1530716da26fb5b2829643f2a
16 changes: 9 additions & 7 deletions src/librustc/ty/flags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ impl FlagComputation {
}

&ty::Placeholder(..) => {
self.add_flags(TypeFlags::HAS_FREE_LOCAL_NAMES);
self.add_flags(TypeFlags::HAS_TY_PLACEHOLDER);
}

Expand All @@ -123,8 +124,7 @@ impl FlagComputation {
match infer {
ty::FreshTy(_) |
ty::FreshIntTy(_) |
ty::FreshFloatTy(_) => {
}
ty::FreshFloatTy(_) => {}

ty::TyVar(_) |
ty::IntVar(_) |
Expand Down Expand Up @@ -245,14 +245,16 @@ impl FlagComputation {
}
}
ConstValue::Param(_) => {
self.add_flags(TypeFlags::HAS_FREE_LOCAL_NAMES | TypeFlags::HAS_PARAMS);
self.add_flags(TypeFlags::HAS_FREE_LOCAL_NAMES);
self.add_flags(TypeFlags::HAS_PARAMS);
}
ConstValue::Placeholder(_) => {
self.add_flags(TypeFlags::HAS_FREE_REGIONS | TypeFlags::HAS_CT_PLACEHOLDER);
self.add_flags(TypeFlags::HAS_FREE_LOCAL_NAMES);
self.add_flags(TypeFlags::HAS_CT_PLACEHOLDER);
}
ConstValue::Scalar(_) => { }
ConstValue::Slice { data: _, start: _, end: _ } => { }
ConstValue::ByRef { alloc: _, offset: _ } => { }
ConstValue::Scalar(_) => {}
ConstValue::Slice { .. } => {}
ConstValue::ByRef { .. } => {}
}
}

Expand Down