Skip to content

Conversation

compiler-errors
Copy link
Member

I have no idea why or how I duplicated these files from compiler/rustc_infer/src/infer/error_reporting/note.rs, but I did by accident, and nothing caught it 🤦

@rustbot
Copy link
Collaborator

rustbot commented Dec 28, 2022

r? @estebank

(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 Dec 28, 2022
@compiler-errors compiler-errors changed the title Remove some totally duplicated files Remove some totally duplicated files in rustc_infer Dec 28, 2022
@fee1-dead
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 28, 2022

📌 Commit 605ad65 has been approved by fee1-dead

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 Dec 28, 2022
@fee1-dead fee1-dead assigned fee1-dead and unassigned estebank Dec 28, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 28, 2022
…fee1-dead

Rollup of 9 pull requests

Successful merges:

 - rust-lang#94145 (Test leaking of BinaryHeap Drain iterators)
 - rust-lang#103945 (Remove `iter::Empty` hack)
 - rust-lang#104024 (Fix `unused_must_use` warning for `Box::from_raw`)
 - rust-lang#104708 (Fix backoff doc to match implementation)
 - rust-lang#105347 (Account for `match` expr in single line)
 - rust-lang#105484 (Implement allow-by-default `multiple_supertrait_upcastable` lint)
 - rust-lang#106184 (Fix `core::any` docs)
 - rust-lang#106201 (Emit fewer errors on invalid `#[repr(transparent)]` on `enum`)
 - rust-lang#106205 (Remove some totally duplicated files in `rustc_infer`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5e9c91c into rust-lang:master Dec 28, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 28, 2022
@compiler-errors compiler-errors deleted the oopsy branch August 11, 2023 20:12
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