remove redundent "<>" for ty::Slice with reference type#103675
remove redundent "<>" for ty::Slice with reference type#103675bors merged 1 commit intorust-lang:masterfrom
Conversation
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @fee1-dead (or someone else) soon. Please see the contribution instructions for more information. |
fee1-dead
left a comment
There was a problem hiding this comment.
There might be a better way. AFAICT this diagnostic is erroneous because the span it covers does not contain the angle brackets, so it prints the suggestion on [_] instead of <[_]>. I believe this can be done pretty cheaply using span_to_source, skipping white space and enlarging the span if you see angle brackets from both sides.
f19acde to
ae055d8
Compare
pushed a new fix by seeing angle brackets from both sides. |
fee1-dead
left a comment
There was a problem hiding this comment.
One last nit. Should be good to go after this.
ae055d8 to
868ccd5
Compare
|
Looks good to me, thanks for this PR! @bors r+ |
…1-dead remove redundent "<>" for ty::Slice with reference type this fix rust-lang#103271
|
@fee1-dead should I do something for the merging conflict? This is the first time I encounter this type of conflict |
|
What merging conflict? I don't see any conflict in your PR. |
It says failed in #103921 (comment) |
|
yes it means your pr failed some tests when it was rolled up. You should see the failures in the error log (after a bit of scrolling ;P). You need to update those tests and then we can merge this again |
868ccd5 to
158b536
Compare
I changed according to that error log. But the CI didn't pass: |
|
@Dylan-DPC any progress on it? |
|
The CI doesn't seem to pass though? let me rerun it. Also i would wait for @fee1-dead 's confirmation whether it is fine to be merged again or not |
|
the test in https://github.com/rust-lang-ci/rust/actions/runs/3420197276/jobs/5694702753 failed as I mentioned before: but if I removed these code: This CI would fail at: |
c48ca7d to
2a081ad
Compare
|
@fee1-dead should be ok now. please approve it again. :) |
2a081ad to
0b6934d
Compare
|
@bors r+ |
…1-dead remove redundent "<>" for ty::Slice with reference type this fix rust-lang#103271
…mpiler-errors Rollup of 9 pull requests Successful merges: - rust-lang#102763 (Some diagnostic-related nits) - rust-lang#103443 (Parser: Recover from using colon as path separator in imports) - rust-lang#103675 (remove redundent "<>" for ty::Slice with reference type) - rust-lang#104046 (bootstrap: add support for running Miri on a file) - rust-lang#104115 (Migrate crate-search element to CSS variables) - rust-lang#104190 (Ignore "Change InferCtxtBuilder from enter to build" in git blame) - rust-lang#104201 (Add check in GUI test for file loading failure) - rust-lang#104211 (:arrow_up: rust-analyzer) - rust-lang#104231 (Update mailmap) Failed merges: - rust-lang#104169 (Migrate `:target` rules to use CSS variables) r? `@ghost` `@rustbot` modify labels: rollup
…1-dead remove redundent "<>" for ty::Slice with reference type this fix rust-lang#103271
…mpiler-errors Rollup of 9 pull requests Successful merges: - rust-lang#102763 (Some diagnostic-related nits) - rust-lang#103443 (Parser: Recover from using colon as path separator in imports) - rust-lang#103675 (remove redundent "<>" for ty::Slice with reference type) - rust-lang#104046 (bootstrap: add support for running Miri on a file) - rust-lang#104115 (Migrate crate-search element to CSS variables) - rust-lang#104190 (Ignore "Change InferCtxtBuilder from enter to build" in git blame) - rust-lang#104201 (Add check in GUI test for file loading failure) - rust-lang#104211 (:arrow_up: rust-analyzer) - rust-lang#104231 (Update mailmap) Failed merges: - rust-lang#104169 (Migrate `:target` rules to use CSS variables) r? `@ghost` `@rustbot` modify labels: rollup
this fix #103271