Avoid panic when matching function call#55742
Merged
bors merged 1 commit intorust-lang:masterfrom Nov 9, 2018
F001:fix-55718
Merged
Avoid panic when matching function call#55742bors merged 1 commit intorust-lang:masterfrom F001:fix-55718
bors merged 1 commit intorust-lang:masterfrom
F001:fix-55718
Conversation
csmoe
reviewed
Nov 7, 2018
Contributor
|
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 |
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit f63c2f8 has been approved by |
Member
|
@bors rollup |
Mark-Simulacrum
added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
Nov 9, 2018
Avoid panic when matching function call Fix rust-lang#55718 This bug is introduced by rust-lang#53751. The original code checked `Def::AssociatedConst(..) | Def::Method(..)` before `pat_ty.no_bound_vars().expect("expected fn type")`. But somehow I exchanged the sequence carelessly. Sorry about that. r? @petrochenkov
bors
added a commit
that referenced
this pull request
Nov 9, 2018
Rollup of 17 pull requests Successful merges: - #55576 (Clarify error message for -C opt-level) - #55633 (Support memcpy/memmove with differing src/dst alignment) - #55638 (Fix ICE in msg_span_from_free_region on ReEmpty) - #55659 (rustc: Delete grouping logic from the musl target) - #55719 (Sidestep link error from rustfix'ed code by using a *defined* static.) - #55736 (Elide anon lifetimes in conflicting impl note) - #55739 (Consume optimization fuel from the MIR inliner) - #55742 (Avoid panic when matching function call) - #55753 (borrow_set: remove a helper function and a clone it uses) - #55755 (Improve creation of 3 IndexVecs) - #55758 ([regression - rust2018]: unused_mut lint false positives on nightly) - #55760 (Remove intermediate font specs) - #55761 (mir: remove a hacky recursive helper function) - #55774 (wasm32-unknown-emscripten expects the rust_eh_personality symbol) - #55777 (Use `Lit` rather than `P<Lit>` in `ast::ExprKind`.) - #55783 (Deprecate mpsc channel selection) - #55788 (rustc: Request ansi colors if stderr isn't a tty) Failed merges: r? @ghost
Contributor
|
Approving for beta because (a) small patch and (b) tight timeline for beta. cc @rust-lang/community |
Member
|
Did you mean to cc @rust-lang/compiler? |
bors
added a commit
that referenced
this pull request
Nov 26, 2018
beta backports Backported PRs: - [x] Avoid panic when matching function call #55742 - [x] [beta] resolve: Implement edition hygiene for imports and absolute paths #56053 r? @ghost cc @rust-lang/release
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
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.
Fix #55718
This bug is introduced by #53751. The original code checked
Def::AssociatedConst(..) | Def::Method(..)beforepat_ty.no_bound_vars().expect("expected fn type"). But somehow I exchanged the sequence carelessly. Sorry about that.r? @petrochenkov