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

moving TestHelpers to test.rs and renaming native.rs to llvm.rs #109649

Closed
wants to merge 3 commits into from

Conversation

jkvargas
Copy link

Fixes issue #108240

@rustbot
Copy link
Collaborator

rustbot commented Mar 27, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added 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) labels Mar 27, 2023
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-llvm-14 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
Prepare all required actions
Getting action download info
Download action repository 'actions/checkout@v3' (SHA:8f4b7f84864484a7bf31766abe9204da3cbe65b3)
Download action repository 'rust-lang/simpleinfra@master' (SHA:13c1b4e09b845ddb9664cee13d03879444a1054d)
Complete job name: PR (x86_64-gnu-llvm-14, false, ubuntu-20.04-16core-64gb)
git config --global core.autocrlf false
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
env:
  CI_JOB_NAME: x86_64-gnu-llvm-14
---
   Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
error[E0433]: failed to resolve: could not find `native` in the crate root
  --> config/tests.rs:14:15
   |
14 |     if crate::native::is_ci_llvm_modified(&parse("")) {
   |               ^^^^^^ could not find `native` in the crate root
For more information about this error, try `rustc --explain E0433`.
error: could not compile `bootstrap` due to previous error
Build completed unsuccessfully in 0:28:23

@jyn514
Copy link
Member

jyn514 commented Mar 27, 2023

@jkvargas how does this differ from #109418, which has already been approved?

@jkvargas
Copy link
Author

@jkvargas how does this differ from #109418, which has already been approved?

Oh, my apologies.
I was on PTO for a while and then I found out there was a conflict on my PR.
I will close this.

@jkvargas jkvargas closed this Mar 27, 2023
@bors
Copy link
Contributor

bors commented Mar 27, 2023

☔ The latest upstream changes (presumably #109662) made this pull request unmergeable. Please resolve the merge conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants