fix type of const params in associated types. #70223
Merged
Conversation
This file contains 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
|
@bors r+ |
|
📌 Commit a9c2378 has been approved by |
bors
added
S-waiting-on-bors
Centril
reviewed
Mar 22, 2020
| @@ -256,15 +256,18 @@ pub(super) fn type_of(tcx: TyCtxt<'_>, def_id: DefId) -> Ty<'_> { | |||
| // figure out which generic parameter it corresponds to and return | |||
| // the relevant type. | |||
| let generics = match path.res { | |||
| Res::Def(DefKind::Ctor(..), def_id) => { | |||
| Res::Def(DefKind::Ctor(..), def_id) | |||
There was a problem hiding this comment.
(We can use nested or-patterns now, for future reference.)
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 22, 2020
fix type of const params in associated types. fixes rust-lang#66906 fixes rust-lang#70167 r? @eddyb
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 22, 2020
Rollup of 10 pull requests Successful merges: - rust-lang#68099 (Amend Rc/Arc::from_raw() docs regarding unsafety) - rust-lang#70172 (parse/lexer: support `StringReader::retokenize` called on external files.) - rust-lang#70209 (parser: recover on `for<'a> |...| body` closures) - rust-lang#70223 (fix type of const params in associated types.) - rust-lang#70229 (more clippy fixes) - rust-lang#70240 (Return NonZeroU64 from ThreadId::as_u64.) - rust-lang#70250 (Remove wrong entry from RELEASES.md) - rust-lang#70253 (Remove another wrong entry from RELEASES.md) - rust-lang#70254 (couple more clippy fixes (let_and_return, if_same_then_else)) - rust-lang#70266 (proc_macro_harness: Use item header spans for errors) Failed merges: r? @ghost
This was referenced Mar 22, 2020
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 24, 2020
…r=eddyb correctly handle const params in type_of extends rust-lang#70223, retry of rust-lang#70276 fixes rust-lang#70273 r? @eddyb cc @varkor
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 24, 2020
…r=eddyb correctly handle const params in type_of extends rust-lang#70223, retry of rust-lang#70276 fixes rust-lang#70273 r? @eddyb cc @varkor
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 24, 2020
…r=eddyb correctly handle const params in type_of extends rust-lang#70223, retry of rust-lang#70276 fixes rust-lang#70273 r? @eddyb cc @varkor
16 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
fixes #66906
fixes #70167
r? @eddyb