emitter: current substitution can be multi-line #89912
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
This comment has been minimized.
This comment has been minimized.
davidtwco
force-pushed
the
issue-89280-split-lines-multiple-lines
branch
from
53f7ddd to
778d7cf
Compare
This comment has been minimized.
This comment has been minimized.
In `splice_lines`, there is some arithmetic to compute the required alignment such that future substitutions in a suggestion are aligned correctly. However, this assumed that the current substitution's span was only on a single line. In circumstances where this was not true, it could result in a arithmetic overflow when the substitution's end column was less than the substitution's start column. Signed-off-by: David Wood <david.wood@huawei.com>
davidtwco
force-pushed
the
issue-89280-split-lines-multiple-lines
branch
from
778d7cf to
d2dc0f3
Compare
|
Thanks for doing this ❤️! @bors r+ rollup |
|
📌 Commit d2dc0f3 has been approved by |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 15, 2021
…ultiple-lines, r=oli-obk emitter: current substitution can be multi-line Fixes rust-lang#89280. In `splice_lines`, there is some arithmetic to compute the required alignment such that future substitutions in a suggestion are aligned correctly. However, this assumed that the current substitution's span was only on a single line. In circumstances where this was not true, it could result in a arithmetic overflow when the substitution's end column was less than the substitution's start column. r? `@oli-obk`
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 15, 2021
…ultiple-lines, r=oli-obk emitter: current substitution can be multi-line Fixes rust-lang#89280. In `splice_lines`, there is some arithmetic to compute the required alignment such that future substitutions in a suggestion are aligned correctly. However, this assumed that the current substitution's span was only on a single line. In circumstances where this was not true, it could result in a arithmetic overflow when the substitution's end column was less than the substitution's start column. r? ``@oli-obk``
jackh726
added a commit
to jackh726/rust
that referenced
this pull request
Oct 16, 2021
…ultiple-lines, r=oli-obk emitter: current substitution can be multi-line Fixes rust-lang#89280. In `splice_lines`, there is some arithmetic to compute the required alignment such that future substitutions in a suggestion are aligned correctly. However, this assumed that the current substitution's span was only on a single line. In circumstances where this was not true, it could result in a arithmetic overflow when the substitution's end column was less than the substitution's start column. r? ```@oli-obk```
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 16, 2021
…askrgr Rollup of 10 pull requests Successful merges: - rust-lang#89509 (Stabilize `unreachable_unchecked` as `const fn`) - rust-lang#89898 (Remove alloc::prelude) - rust-lang#89902 (Restrict the aarch64 outline atomics test to Linux) - rust-lang#89906 (Moved format-version constant to rustdoc-json-types) - rust-lang#89912 (emitter: current substitution can be multi-line) - rust-lang#89914 (Emit impl difference error for GenericBoundFailure too) - rust-lang#89915 (Some outlives cleanup) - rust-lang#89918 (Add some GATs related regression tests) - rust-lang#89921 ([fuchsia] Update process info struct) - rust-lang#89925 (updating docs to mention usage of AtomicBool) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
# 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.
Fixes #89280.
In
splice_lines, there is some arithmetic to compute the required alignment such that future substitutions in a suggestion are aligned correctly. However, this assumed that the current substitution's span was only on a single line. In circumstances where this was not true, it could result in a arithmetic overflow when the substitution's end column was less than the substitution's start column.r? @oli-obk