/rust

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.

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

Fix suggestions given mulitple bad lifetimes #57720

Merged
merged 1 commit into from Jan 19, 2019

Conversation

Reviewers

@estebank estebank

Assignees

@estebank estebank

Labels
S-waiting-on-bors
Projects
None yet
Milestone
No milestone
4 participants
@dlrobertson @estebank @bors @rust-highfive
@dlrobertson
Copy link
Contributor

dlrobertson commented Jan 18, 2019 •
edited

When given multiple lifetimes prior to type parameters in generic
parameters, do not ICE and print the correct suggestion.

r? @estebank

CC @pnkfelix

Fixes: #57521
@dlrobertson
Fix suggestions given mulitple bad lifetimes 
When given multiple lifetimes prior to type parameters in generic
parameters, do not ICE and print the correct suggestion.
Verified
This commit was signed with a verified signature.
@dlrobertson dlrobertson Dan Robertson
GPG key ID: 45C4A652C47E42A5 Learn about signing commits
Loading status checks…
e3ba6ed

@rust-highfive rust-highfive assigned estebank Jan 18, 2019

@rust-highfive rust-highfive added the S-waiting-on-review label Jan 18, 2019

@dlrobertson

dlrobertson reviewed Jan 18, 2019
View changes

src/librustc_errors/lib.rs
Some(hi) => &line[lo..hi],
None => &line[lo..],
});
match hi_opt {

This comment has been minimized.

Sign in to view
Copy link
@dlrobertson

dlrobertson Jan 18, 2019

Author Contributor

Technically this isn't needed to fix the ICE

This comment has been minimized.

Sign in to view
Copy link
@estebank

estebank Jan 18, 2019

Contributor

Let's keep it and at least not ICE due to bugs elsewhere.
@estebank

This comment has been minimized.

Sign in to view
Copy link
Contributor

estebank commented Jan 18, 2019

@bors r+ rollup
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jan 18, 2019

📌 Commit e3ba6ed has been approved by estebank

@bors bors added S-waiting-on-bors and removed S-waiting-on-review labels Jan 18, 2019

Centril added a commit to Centril/rust that referenced this pull request Jan 18, 2019

@Centril
Rollup merge of rust-lang#57720 - dlrobertson:fix_57521, r=estebank 
Fix suggestions given mulitple bad lifetimes

When given multiple lifetimes prior to type parameters in generic
parameters, do not ICE and print the correct suggestion.

r? @estebank

CC @pnkfelix

Fixes: rust-lang#57521
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
ca72ad1

@Centril Centril referenced this pull request Jan 18, 2019

Closed

Rollup of 22 pull requests #57727

bors added a commit that referenced this pull request Jan 18, 2019

@bors
Auto merge of #57727 - Centril:rollup, r=Centril 
Rollup of 22 pull requests

Successful merges:

 - #56594 (Remove confusing comment about ideally using `!` for `c_void`)
 - #57107 (Add a regression test for mutating a non-mut #[thread_local])
 - #57340 (Use correct tracking issue for c_variadic)
 - #57357 (Cleanup PartialEq docs.)
 - #57370 (Support passing cflags/cxxflags/ldflags to LLVM build)
 - #57475 (Add signed num::NonZeroI* types)
 - #57501 (High priority resolutions for associated variants)
 - #57551 (resolve: Add a test for issue #57539)
 - #57610 (Fix nested `?` matchers)
 - #57634 (Remove an unused function argument)
 - #57635 (use structured macro and path resolve suggestions)
 - #57636 (Fix sources sidebar not showing up)
 - #57646 (Fixes text becoming invisible when element targetted)
 - #57649 (privacy: Account for associated existential types)
 - #57650 (librustc_metadata: Pass a default value when unwrapping a span)
 - #57654 (Add some links in std::fs.)
 - #57658 (Two HIR tweaks)
 - #57659 (Fix release manifest generation)
 - #57683 (Document Unpin in std::prelude documentation)
 - #57685 (Enhance `Pin` impl applicability for `PartialEq` and `PartialOrd`.)
 - #57698 (Fix typo bug in DepGraph::try_mark_green().)
 - #57720 (Fix suggestions given mulitple bad lifetimes)

Failed merges:

r? @ghost
Loading status checks…
fd3f45b

Centril added a commit to Centril/rust that referenced this pull request Jan 18, 2019

@Centril
Rollup merge of rust-lang#57720 - dlrobertson:fix_57521, r=estebank 
Fix suggestions given mulitple bad lifetimes

When given multiple lifetimes prior to type parameters in generic
parameters, do not ICE and print the correct suggestion.

r? @estebank

CC @pnkfelix

Fixes: rust-lang#57521
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
bb28809

@Centril Centril referenced this pull request Jan 18, 2019

Closed

Rollup of 21 pull requests #57732

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 18, 2019

@GuillaumeGomez
Rollup merge of rust-lang#57720 - dlrobertson:fix_57521, r=estebank 
Fix suggestions given mulitple bad lifetimes

When given multiple lifetimes prior to type parameters in generic
parameters, do not ICE and print the correct suggestion.

r? @estebank

CC @pnkfelix

Fixes: rust-lang#57521
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
109b12e

@GuillaumeGomez GuillaumeGomez referenced this pull request Jan 18, 2019

Closed

Rollup of 17 pull requests #57733

bors added a commit that referenced this pull request Jan 18, 2019

@bors
Auto merge of #57732 - Centril:rollup, r=Centril 
Rollup of 21 pull requests

Successful merges:

 - #56594 (Remove confusing comment about ideally using `!` for `c_void`)
 - #57107 (Add a regression test for mutating a non-mut #[thread_local])
 - #57340 (Use correct tracking issue for c_variadic)
 - #57357 (Cleanup PartialEq docs.)
 - #57370 (Support passing cflags/cxxflags/ldflags to LLVM build)
 - #57501 (High priority resolutions for associated variants)
 - #57551 (resolve: Add a test for issue #57539)
 - #57610 (Fix nested `?` matchers)
 - #57634 (Remove an unused function argument)
 - #57635 (use structured macro and path resolve suggestions)
 - #57636 (Fix sources sidebar not showing up)
 - #57646 (Fixes text becoming invisible when element targetted)
 - #57650 (librustc_metadata: Pass a default value when unwrapping a span)
 - #57654 (Add some links in std::fs.)
 - #57658 (Two HIR tweaks)
 - #57659 (Fix release manifest generation)
 - #57683 (Document Unpin in std::prelude documentation)
 - #57685 (Enhance `Pin` impl applicability for `PartialEq` and `PartialOrd`.)
 - #57698 (Fix typo bug in DepGraph::try_mark_green().)
 - #57720 (Fix suggestions given mulitple bad lifetimes)
 - #57725 (Use structured suggestion to surround struct literal with parenthesis)

Failed merges:

r? @ghost
Loading status checks…
cbcca85

Centril added a commit to Centril/rust that referenced this pull request Jan 18, 2019

@Centril
Rollup merge of rust-lang#57720 - dlrobertson:fix_57521, r=estebank 
Fix suggestions given mulitple bad lifetimes

When given multiple lifetimes prior to type parameters in generic
parameters, do not ICE and print the correct suggestion.

r? @estebank

CC @pnkfelix

Fixes: rust-lang#57521
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
42accf0

@Centril Centril referenced this pull request Jan 18, 2019

Merged

Rollup of 11 pull requests #57747

bors added a commit that referenced this pull request Jan 18, 2019

@bors
Auto merge of #57747 - Centril:rollup, r=Centril 
Rollup of 11 pull requests

Successful merges:

 - #57107 (Add a regression test for mutating a non-mut #[thread_local])
 - #57132 (Document that `-C opt-level=0` implies `-C debug-assertions`.)
 - #57212 (docs(rustc): Link to the book's source in rustc)
 - #57302 (Fix unused_assignments false positive)
 - #57350 (Better error note on unimplemented Index trait for string)
 - #57635 (use structured macro and path resolve suggestions)
 - #57650 (librustc_metadata: Pass a default value when unwrapping a span)
 - #57657 (Add regression test to close #53787)
 - #57658 (Two HIR tweaks)
 - #57720 (Fix suggestions given mulitple bad lifetimes)
 - #57725 (Use structured suggestion to surround struct literal with parenthesis)

Failed merges:

r? @ghost
Loading status checks…
f001287

@bors bors merged commit e3ba6ed into rust-lang:master Jan 19, 2019

@dlrobertson dlrobertson deleted the dlrobertson:fix_57521 branch Jan 19, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment