resolve: Fix span arithmetics in the import conflict error #57908
Conversation
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
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ |
|
📌 Commit 1b659d6 has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jan 26, 2019
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
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
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
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
|
The issue is already on stable, but this is still a very recent regression and it's encountered relatively often, beta nominating. |
petrochenkov
added
the
beta-nominated
|
triage, beta-accepted |
pnkfelix
added
the
beta-accepted
pietroalbini
removed
beta-nominated
bors
added a commit
that referenced
this pull request
Feb 17, 2019
[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
[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
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
#56937 rebased and fixed
Fixes #56411
Fixes #57071
Fixes #57787
Fixes #58417
r? @estebank