Introduce with_forced_trimmed_paths#105411
Merged
bors merged 2 commits intorust-lang:masterfrom Dec 11, 2022
Merged
Conversation
Collaborator
|
r? @davidtwco (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
T-bootstrap
Contributor
Author
|
r? @oli-obk |
oli-obk
reviewed
Dec 7, 2022
oli-obk
reviewed
Dec 7, 2022
Contributor
oli-obk
left a comment
oli-obk
left a comment
There was a problem hiding this comment.
r=me after the PR this is based on has landed
Collaborator
|
☔ The latest upstream changes (presumably #105456) made this pull request unmergeable. Please resolve the merge conflicts. |
Contributor
Author
|
@bors r=oli-obk |
Collaborator
|
📌 Commit c1e8694c20457fefaac452e829b965a399e9f7c3 has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
Contributor
Author
|
Fixed single test divergence @bors r=oli-obk |
Collaborator
|
📌 Commit abb34cd7c5522ec63deca8332ac02cc564cc3140 has been approved by It is now in the queue for this repository. |
Collaborator
|
☔ The latest upstream changes (presumably #105525) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 10, 2022
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#104460 (Migrate parts of `rustc_expand` to session diagnostics) - rust-lang#105192 (Point at LHS on binop type err if relevant) - rust-lang#105234 (Remove unneeded field from `SwitchTargets`) - rust-lang#105239 (Avoid heap allocation when truncating thread names) - rust-lang#105410 (Consider `parent_count` for const param defaults) - rust-lang#105482 (Fix invalid codegen during debuginfo lowering) Failed merges: - rust-lang#105411 (Introduce `with_forced_trimmed_paths`) r? `@ghost` `@rustbot` modify labels: rollup
estebank
force-pushed
the
short-names
branch
from
abb34cd to
17547af
Compare
Contributor
Author
|
@bors r=oli-obk |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 11, 2022
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#105411 (Introduce `with_forced_trimmed_paths`) - rust-lang#105532 (Document behaviour of `--remap-path-prefix` with several matches) - rust-lang#105537 (compiler: remove unnecessary imports and qualified paths) - rust-lang#105539 (rustdoc: Only hide lines starting with `#` in rust code blocks ) - rust-lang#105546 (Add some regression tests for rust-lang#44454) - rust-lang#105547 (Add regression test for rust-lang#104582) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Built on top of #104922, only last commit is relevant.