Skip to content

Move some test files#120629

Merged
bors merged 1 commit intorust-lang:masterfrom
c410-f3r:testsssssss
Feb 10, 2024
Merged

Move some test files#120629
bors merged 1 commit intorust-lang:masterfrom
c410-f3r:testsssssss

Conversation

@c410-f3r
Copy link
Contributor

@c410-f3r c410-f3r commented Feb 4, 2024

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 4, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@petrochenkov
Copy link
Contributor

petrochenkov commented Feb 6, 2024

issue-26905-rpass.rs -> coercion
issue-26905.rs -> coercion
extern-mod-syntax.rs -> remove it or imports
issue-62375.rs -> binop maybe

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 6, 2024
@bors

This comment was marked as resolved.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@c410-f3r
Copy link
Contributor Author

c410-f3r commented Feb 8, 2024 •
edited
Loading

Done

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 8, 2024
@petrochenkov
Copy link
Contributor

petrochenkov commented Feb 9, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 9, 2024

📌 Commit fd7d494 has been approved by petrochenkov

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 Feb 9, 2024
@bors

This comment was marked as resolved.

Sign in to view
@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 9, 2024
@c410-f3r
Copy link
Contributor Author

c410-f3r commented Feb 9, 2024

2 conflicting modifications of ui_tests increasing ROOT_ENTRY_LIMIT

@rustbot rustbot added the has-merge-commits PR has merge commits, merge with caution. label Feb 9, 2024
@rustbot
Copy link
Collaborator

rustbot commented Feb 9, 2024

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git rebase -i master
$ # delete any merge commits in the editor that appears
$ git push --force-with-lease

The following commits are merge commits:

@rustbot rustbot removed the has-merge-commits PR has merge commits, merge with caution. label Feb 9, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@petrochenkov
Copy link
Contributor

petrochenkov commented Feb 9, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 9, 2024

📌 Commit 69a5264 has been approved by petrochenkov

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 9, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 9, 2024
@matthiaskrgr
Rollup merge of rust-lang#120629 - c410-f3r:testsssssss, r=petrochenkov
4cfee4b 
Move some test files

r? `@petrochenkov`
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 9, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 9, 2024
@bors
Auto merge of rust-lang#120861 - matthiaskrgr:rollup-pkbbh0r, r=matth…
036b1d1 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#120584 (For a rigid projection, recursively look at the self type's item bounds to fix the `associated_type_bounds` feature)
 - rust-lang#120589 (std::thread::available_parallelism merging linux/android/freebsd version)
 - rust-lang#120596 ([rustdoc] Correctly generate path for non-local items in source code pages)
 - rust-lang#120629 (Move some test files)
 - rust-lang#120846 (Update jobserver-rs to 0.1.28)
 - rust-lang#120850 (ast_lowering: Fix regression in `use ::{}` imports.)
 - rust-lang#120853 (Avoid a collection and iteration on empty passes)

Failed merges:

 - rust-lang#120549 (modify alias-relate to also normalize ambiguous opaques)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 9, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 10, 2024
@bors
Auto merge of rust-lang#120862 - matthiaskrgr:rollup-jzfab58, r=matth…
b5c46dc 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#120584 (For a rigid projection, recursively look at the self type's item bounds to fix the `associated_type_bounds` feature)
 - rust-lang#120596 ([rustdoc] Correctly generate path for non-local items in source code pages)
 - rust-lang#120629 (Move some test files)
 - rust-lang#120846 (Update jobserver-rs to 0.1.28)
 - rust-lang#120850 (ast_lowering: Fix regression in `use ::{}` imports.)
 - rust-lang#120853 (Avoid a collection and iteration on empty passes)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 34489b7 into rust-lang:master Feb 10, 2024
@rustbot rustbot added this to the 1.78.0 milestone Feb 10, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 10, 2024
@rust-timer
Unrolled build for rust-lang#120629
32a2c87 
Rollup merge of rust-lang#120629 - c410-f3r:testsssssss, r=petrochenkov

Move some test files

r? ``@petrochenkov``
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@petrochenkov petrochenkov

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.78.0

Development

Successfully merging this pull request may close these issues.

5 participants

@c410-f3r @rust-log-analyzer @petrochenkov @bors @rustbot