Skip to content

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Dec 22, 2024

These are just const trait tests now, after all.

There was one naming conflict between the aux-build tests/ui/traits/const-traits/effects/auxiliary/cross-crate.rs and tests/ui/traits/const-traits/auxiliary/cross-crate.rs. The former didn't really test anything useful since we no longer have an effect param, so I removed the test that owned it: tests/ui/traits/const-traits/effects/no-explicit-const-params-cross-crate.rs.

r? project-const-traits

@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 22, 2024
@fmease
Copy link
Member

fmease commented Dec 22, 2024

r? fmease @bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 22, 2024

📌 Commit 582167a has been approved by fmease

It is now in the queue for this repository.

@rustbot rustbot assigned fmease and unassigned fee1-dead Dec 22, 2024
@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 22, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 22, 2024
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#134364 (Use E0665 for missing `#[default]` on enum and update doc)
 - rust-lang#134601 (Support pretty-printing `dyn*` trait objects)
 - rust-lang#134603 (Explain why a type is not eligible for `impl PointerLike`.)
 - rust-lang#134618 (coroutine_clone: add comments)
 - rust-lang#134630 (Use `&raw` for `ptr` primitive docs)
 - rust-lang#134637 (Flatten effects directory now that it doesn't really test anything specific)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 66dbfd4 into rust-lang:master Dec 22, 2024
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 22, 2024
Rollup merge of rust-lang#134637 - compiler-errors:fx-test, r=fmease

Flatten effects directory now that it doesn't really test anything specific

These are just const trait tests now, after all.

There was one naming conflict between the aux-build `tests/ui/traits/const-traits/effects/auxiliary/cross-crate.rs` and `tests/ui/traits/const-traits/auxiliary/cross-crate.rs`. The former didn't really test anything useful since we no longer have an effect param, so I removed the test that owned it: `tests/ui/traits/const-traits/effects/no-explicit-const-params-cross-crate.rs`.

r? project-const-traits
@rustbot rustbot added this to the 1.85.0 milestone Dec 22, 2024
github-actions bot pushed a commit to tautschnig/verify-rust-std that referenced this pull request Mar 11, 2025
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#134364 (Use E0665 for missing `#[default]` on enum and update doc)
 - rust-lang#134601 (Support pretty-printing `dyn*` trait objects)
 - rust-lang#134603 (Explain why a type is not eligible for `impl PointerLike`.)
 - rust-lang#134618 (coroutine_clone: add comments)
 - rust-lang#134630 (Use `&raw` for `ptr` primitive docs)
 - rust-lang#134637 (Flatten effects directory now that it doesn't really test anything specific)

r? `@ghost`
`@rustbot` modify labels: rollup
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