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

resolve: Fix span arithmetics in the import conflict error #57908

Merged
merged 2 commits into from Jan 26, 2019

Conversation

Projects
None yet
7 participants
@petrochenkov
Copy link
Contributor

petrochenkov commented Jan 25, 2019

#56937 rebased and fixed

Fixes #56411
Fixes #57071
Fixes #57787
Fixes #58417

r? @estebank

@estebank

This comment has been minimized.

Copy link
Contributor

estebank commented Jan 25, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 25, 2019

📌 Commit 1b659d6 has been approved by estebank

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

Rollup merge of rust-lang#57908 - petrochenkov:errepice, r=estebank
resolve: Fix span arithmetics in the import conflict error

rust-lang#56937 rebased and fixed

Fixes rust-lang#56411
Fixes rust-lang#57071
Fixes rust-lang#57787

r? @estebank

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

Rollup merge of rust-lang#57908 - petrochenkov:errepice, r=estebank
resolve: Fix span arithmetics in the import conflict error

rust-lang#56937 rebased and fixed

Fixes rust-lang#56411
Fixes rust-lang#57071
Fixes rust-lang#57787

r? @estebank

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

Auto merge of #57912 - Centril:rollup, r=Centril
Rollup of 9 pull requests

Successful merges:

 - #57425 (std: Stabilize fixed-width integer atomics)
 - #57703 (Make MutexGuard's Debug implementation more useful.)
 - #57729 (extra testing of how NLL handles wildcard type `_`)
 - #57764 (Fix some minor warnings)
 - #57825 (un-deprecate mem::zeroed)
 - #57827 (Ignore aarch64 in simd-intrinsic-generic-reduction)
 - #57852 (Suggest removing leading left angle brackets.)
 - #57882 (overhaul unused doc comments lint)
 - #57908 (resolve: Fix span arithmetics in the import conflict error)

Failed merges:

r? @ghost

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

Rollup merge of rust-lang#57908 - petrochenkov:errepice, r=estebank
resolve: Fix span arithmetics in the import conflict error

rust-lang#56937 rebased and fixed

Fixes rust-lang#56411
Fixes rust-lang#57071
Fixes rust-lang#57787

r? @estebank

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

Auto merge of #57918 - Centril:rollup, r=Centril
Rollup of 7 pull requests

Successful merges:

 - #57407 (Stabilize extern_crate_self)
 - #57703 (Make MutexGuard's Debug implementation more useful.)
 - #57764 (Fix some minor warnings)
 - #57825 (un-deprecate mem::zeroed)
 - #57827 (Ignore aarch64 in simd-intrinsic-generic-reduction)
 - #57908 (resolve: Fix span arithmetics in the import conflict error)
 - #57913 (Change crate-visibility-modifier issue number in The Unstable Book)

Failed merges:

r? @ghost

@bors bors merged commit 1b659d6 into rust-lang:master Jan 26, 2019

@petrochenkov

This comment has been minimized.

Copy link
Contributor Author

petrochenkov commented Feb 13, 2019

The issue is already on stable, but this is still a very recent regression and it's encountered relatively often, beta nominating.

@pnkfelix

This comment has been minimized.

Copy link
Member

pnkfelix commented Feb 14, 2019

triage, beta-accepted

bors added a commit that referenced this pull request Feb 17, 2019

Auto merge of #58537 - pietroalbini:beta-backports, r=pietroalbini
[beta] Rollup backports

Cherry-picked:

* #58207: Make `intern_lazy_const` actually intern its argument.
* #58161: Lower constant patterns with ascribed types.
* #57908: resolve: Fix span arithmetics in the import conflict error
* #57835: typeck: remove leaky nested probe during trait object method resolution
* #57885: Avoid committing to autoderef in object method probing
* #57646: Fixes text becoming invisible when element targetted

Rolled up:

* #58522: [BETA] Update cargo

r? @ghost

bors added a commit that referenced this pull request Feb 19, 2019

Auto merge of #58537 - pietroalbini:beta-backports, r=pietroalbini
[beta] Rollup backports

Cherry-picked:

* #58207: Make `intern_lazy_const` actually intern its argument.
* #58161: Lower constant patterns with ascribed types.
* #57908: resolve: Fix span arithmetics in the import conflict error
* #57835: typeck: remove leaky nested probe during trait object method resolution
* #57885: Avoid committing to autoderef in object method probing
* #57646: Fixes text becoming invisible when element targetted

Rolled up:

* #58522: [BETA] Update cargo

r? @ghost

bors added a commit that referenced this pull request Feb 19, 2019

Auto merge of #58537 - pietroalbini:beta-backports, r=pietroalbini
[beta] Rollup backports

Cherry-picked:

* #58207: Make `intern_lazy_const` actually intern its argument.
* #58161: Lower constant patterns with ascribed types.
* #57908: resolve: Fix span arithmetics in the import conflict error
* #57835: typeck: remove leaky nested probe during trait object method resolution
* #57885: Avoid committing to autoderef in object method probing
* #57646: Fixes text becoming invisible when element targetted

Rolled up:

* #58522: [BETA] Update cargo

r? @ghost

bors added a commit that referenced this pull request Feb 20, 2019

Auto merge of #58537 - pietroalbini:beta-backports, r=pietroalbini
[beta] Rollup backports

Cherry-picked:

* #58207: Make `intern_lazy_const` actually intern its argument.
* #58161: Lower constant patterns with ascribed types.
* #57908: resolve: Fix span arithmetics in the import conflict error
* #57835: typeck: remove leaky nested probe during trait object method resolution
* #57885: Avoid committing to autoderef in object method probing
* #57646: Fixes text becoming invisible when element targetted

Rolled up:

* #58522: [BETA] Update cargo

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