Skip to content
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

remove duplicated calls to sort_string #109017

Merged
merged 1 commit into from
Mar 12, 2023
Merged

remove duplicated calls to sort_string #109017

merged 1 commit into from
Mar 12, 2023

Conversation

klensy
Copy link
Contributor

@klensy klensy commented Mar 11, 2023

with_forced_trimmed_paths! was removed in 62ba3e7, and this lines became dups.

@rustbot
Copy link
Collaborator

rustbot commented Mar 11, 2023

r? @davidtwco

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 11, 2023
@cjgillot
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 11, 2023

📌 Commit 898d2c1 has been approved by cjgillot

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 11, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 12, 2023
remove duplicated calls to sort_string

`with_forced_trimmed_paths!` was removed in rust-lang@62ba3e7, and this lines became dups.
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 12, 2023
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#108726 (tidy: enforce comment blocks to have an even number of backticks)
 - rust-lang#108797 (Allow binary files to go through the `FileLoader`)
 - rust-lang#108841 (Add suggestion to diagnostic when user has array but trait wants slice. (rebased))
 - rust-lang#108984 (bootstrap: document tidy)
 - rust-lang#109013 (Give proper error message when tcx wasn't passed to decoder)
 - rust-lang#109017 (remove duplicated calls to sort_string)
 - rust-lang#109018 (Expand on the allocator comment in `rustc-main`)
 - rust-lang#109028 (Add eslint checks for rustdoc-js tester)
 - rust-lang#109034 (Commit some tests for the new solver + lazy norm)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c9a38c3 into rust-lang:master Mar 12, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants