Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

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

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged

Conversation

@rohaquinlop
Copy link
Contributor

Fixed#108240

Renamed 'native.rs' to 'llvm.rs', also movedTestHelpers totest.rs. Replaced all thenative.rs occurrences atsrc/bootstrap files tollvm.rs

@rustbot
Copy link
Collaborator

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 seethe 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 andS-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

@rustbotrustbot added A-testsuiteArea: The testsuite used to check the correctness of rustc S-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties. T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue. labelsMar 20, 2023
@bors
Copy link
Collaborator

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

@albertlarsan68
Copy link
Member

Pleaserebase on top of newmaster instead of merging.
@rustbot author

@rustbotrustbot added S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties. labelsMar 22, 2023
@rohaquinlop
Copy link
ContributorAuthor

@albertlarsan68 Done.

@albertlarsan68
Copy link
Member

Not quite, try again! :)

@rohaquinlop
Copy link
ContributorAuthor

@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 rungit rebase upstream/master, with theupstream remote being an up-to-date remote of the rust-lang/rust repo, and then rungit push --force-with-lease.

@rohaquinlop
Copy link
ContributorAuthor

@albertlarsan68 Guess it's done.

@albertlarsan68albertlarsan68force-pushed the108240-rename-native.rs-to-llvm.rs branch frome764634 to6d93c6cCompareMarch 22, 2023 14:25
@albertlarsan68
Copy link
Member

I rebased for you.

@rohaquinloprohaquinlopforce-pushed the108240-rename-native.rs-to-llvm.rs branch from6d93c6c tob630d8aCompareMarch 22, 2023 23:37
@bors
Copy link
Collaborator

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

@rohaquinloprohaquinlopforce-pushed the108240-rename-native.rs-to-llvm.rs branch fromb630d8a to4ba3a2aCompareMarch 23, 2023 21:48
@rohaquinlop
Copy link
ContributorAuthor

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

@rohaquinloprohaquinlopforce-pushed the108240-rename-native.rs-to-llvm.rs branch from4ba3a2a to5d66f99CompareMarch 24, 2023 13:09
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`
@rohaquinloprohaquinlopforce-pushed the108240-rename-native.rs-to-llvm.rs branch from5d66f99 to291ddb8CompareMarch 24, 2023 13:59
@klensy
Copy link
Contributor

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

rohaquinlop reacted with hooray emoji

@rohaquinlop
Copy link
ContributorAuthor

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

Great!

@klensy
Copy link
Contributor

@rustbot review

@rustbotrustbot added S-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author. labelsMar 26, 2023
@Mark-Simulacrum
Copy link
Member

Thanks!@bors r+

@bors
Copy link
Collaborator

📌 Commit291ddb8 has been approved byMark-Simulacrum

It is now in thequeue for this repository.

@bors
Copy link
Collaborator

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

@borsbors added S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties. labelsMar 26, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull requestMar 27, 2023
…iaskrgrRollup of 7 pull requestsSuccessful 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
@borsbors merged commit3917644 intorust-lang:masterMar 27, 2023
@rustbotrustbot added this to the1.70.0 milestoneMar 27, 2023
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@albertlarsan68albertlarsan68albertlarsan68 left review comments

@klensyklensyAwaiting requested review from klensy

Assignees

@Mark-SimulacrumMark-Simulacrum

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-infraRelevant 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.

Renamesrc/bootstrap/native.rs tollvm.rs

6 participants

@rohaquinlop@rustbot@bors@albertlarsan68@klensy@Mark-Simulacrum
[8]ページ先頭
©2009-2025 Movatter.jp