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.

Sign up for GitHub

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

Jump to bottom

Rename 'src/bootstrap/native.rs' to llvm.rs #109418

Merged
merged 1 commit into from
Mar 27, 2023
Merged

Rename 'src/bootstrap/native.rs' to llvm.rs #109418

merged 1 commit into from
Mar 27, 2023

Conversation

rohaquinlop
Copy link
Contributor

Fixed #108240

Renamed 'native.rs' to 'llvm.rs', also moved TestHelpers to test.rs. Replaced all the native.rs occurrences at src/bootstrap files to llvm.rs

@rustbot
Copy link
Collaborator

rustbot commented Mar 20, 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 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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Mar 20, 2023
@bors
Copy link
Contributor

bors commented Mar 21, 2023

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

@albertlarsan68
Copy link
Member

Please rebase on top of new master instead of merging.
@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 Mar 22, 2023
@rohaquinlop
Copy link
Contributor Author

@albertlarsan68 Done.

@albertlarsan68
Copy link
Member

Not quite, try again! :)

@rohaquinlop
Copy link
Contributor Author

@albertlarsan68 Should I rebase my fork master with the branch I created with my changes? I don't get it, it's my first time 😅

@albertlarsan68
Copy link
Member

I would run git rebase upstream/master, with the upstream remote being an up-to-date remote of the rust-lang/rust repo, and then run git push --force-with-lease.

@rohaquinlop
Copy link
Contributor Author

@albertlarsan68 Guess it's done.

@albertlarsan68 albertlarsan68 force-pushed the 108240-rename-native.rs-to-llvm.rs branch from e764634 to 6d93c6c Compare March 22, 2023 14:25
@albertlarsan68
Copy link
Member

I rebased for you.

klensy
klensy reviewed Mar 22, 2023
View reviewed changes
src/ci/stage-build.py Outdated Show resolved Hide resolved
@rohaquinlop rohaquinlop force-pushed the 108240-rename-native.rs-to-llvm.rs branch from 6d93c6c to b630d8a Compare March 22, 2023 23:37
@bors
Copy link
Contributor

bors commented Mar 23, 2023

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

@rohaquinlop rohaquinlop force-pushed the 108240-rename-native.rs-to-llvm.rs branch from b630d8a to 4ba3a2a Compare March 23, 2023 21:48
@rohaquinlop
Copy link
Contributor Author

@albertlarsan68 Guess everything is Ok now, I'll be pending if anything goes wrong (Hope this isn't the case 😅).

klensy
klensy reviewed Mar 24, 2023
View reviewed changes
src/bootstrap/llvm.rs Outdated Show resolved Hide resolved
@rohaquinlop rohaquinlop force-pushed the 108240-rename-native.rs-to-llvm.rs branch from 4ba3a2a to 5d66f99 Compare March 24, 2023 13:09
@rohaquinlop
Rename 'src/bootstrap/native.rs' to llvm.rs
291ddb8 
Renamed 'native.rs' to 'llvm.rs', also moved `TestHelpers` to `test.rs`.Replaced all the `native.rs` ocurrences at `src/bootstrap` files to `llvm.rs`
@rohaquinlop rohaquinlop force-pushed the 108240-rename-native.rs-to-llvm.rs branch from 5d66f99 to 291ddb8 Compare March 24, 2023 13:59
@rohaquinlop rohaquinlop requested a review from klensy March 25, 2023 18:50
@klensy
Copy link
Contributor

klensy commented Mar 25, 2023

Looking at diff +101/-101, looks correct.

@rohaquinlop
Copy link
Contributor Author

Looking at diff +101/-101, looks correct.

Great!

@klensy
Copy link
Contributor

klensy commented Mar 26, 2023

@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 Mar 26, 2023
@Mark-Simulacrum
Copy link
Member

Thanks! @bors r+

@bors
Copy link
Contributor

bors commented Mar 26, 2023

📌 Commit 291ddb8 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Mar 26, 2023

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 26, 2023
@jyn514 jyn514 mentioned this pull request Mar 27, 2023
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 27, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 27, 2023
@bors
Auto merge of rust-lang#109662 - matthiaskrgr:rollup-tk2g3jf, r=matth…
dd19135 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#108625 (More config.toml.example cleanups)
 - rust-lang#109418 (Rename 'src/bootstrap/native.rs' to llvm.rs)
 - rust-lang#109580 (Remove some stale FIXMEs in new solver)
 - rust-lang#109582 (Refactor: Separate `LocalRef` variant for not-evaluated-yet operands)
 - rust-lang#109650 (Remove Nilstrieb from review rotation)
 - rust-lang#109656 (Update cargo)
 - rust-lang#109658 (Backport 1.68.1 and 1.68.2 release notes to `master`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3917644 into rust-lang:master Mar 27, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@albertlarsan68 albertlarsan68 albertlarsan68 left review comments

@klensy klensy Awaiting requested review from klensy

Assignees

@Mark-Simulacrum Mark-Simulacrum

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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.

Rename src/bootstrap/native.rs to llvm.rs
6 participants
@rohaquinlop @rustbot @bors @albertlarsan68 @klensy @Mark-Simulacrum