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

Update target-arch-aware crates to support mips r6 targets #12720

Merged
merged 1 commit into from
Sep 24, 2023
Merged

Update target-arch-aware crates to support mips r6 targets #12720

merged 1 commit into from
Sep 24, 2023

Conversation

chenx97
Copy link
Contributor

@chenx97 chenx97 commented Sep 21, 2023 •
edited
Loading

What does this PR try to resolve?

This PR gets rid of rustix@0.37 and linux-raw-sys@0.3 and updates libc in order to support MIPS R6 targets introduced by #112374.

How should we test and review this PR?

Existing tests and CI should suffice.

Additional information

N/A

@rustbot
Copy link
Collaborator

rustbot commented Sep 21, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @epage (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 the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 21, 2023
weihanglo
weihanglo reviewed Sep 21, 2023
View reviewed changes
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the contribution :)

Could you share the command you had the lockfile updated? Also, we generally update Cargo.toml to guarantee versions cannot be downgraded. For example, clap = "4.4.4" seems to be the correct version requirement for this PR.

@chenx97
Copy link
Contributor Author

chenx97 commented Sep 21, 2023

Could you share the command you had the lockfile updated?

cargo +nightly update gix-path gix-prompt clap is-terminal libc

@chenx97
Copy link
Contributor Author

chenx97 commented Sep 21, 2023

Cargo.toml updated.

@weihanglo
Copy link
Member

Thanks. For version bumps for gix related packages, I lean toward updating gix directly, though doing so requires human reviews.

@chenx97
Copy link
Contributor Author

chenx97 commented Sep 23, 2023

Thanks. For version bumps for gix related packages, I lean toward updating gix directly, though doing so requires human reviews.

Gix now uses symbolic refs for refs/remotes/origin/HEAD and it confuses cargo. What should I do?

@weihanglo
Copy link
Member

I am fine that we move forward without updating gix. Just note that it may have a chance of being downgraded accidentally. Does that sound good to you, @chenx97?

@chenx97
Copy link
Contributor Author

chenx97 commented Sep 24, 2023

I am fine that we move forward without updating gix. Just note that it may have a chance of being downgraded accidentally. Does that sound good to you, @chenx97?

We can upgrade gix to 0.50.1.

weihanglo
weihanglo reviewed Sep 24, 2023
View reviewed changes
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Could we squash/rearrange them into fewer commits, so that the git history could be a bit clearer?

Cargo.toml Outdated Show resolved Hide resolved
@chenx97
Update target-arch-aware crates to support mips r6 targets
277368d 
This includes libc itself and dependencies that rely on
rustix 0.37.

command used for the update:

```shell
cargo update -p is-terminal
```
weihanglo
weihanglo approved these changes Sep 24, 2023
View reviewed changes
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the back-and-forth updates!

The only thing not guaranteed in Cargo.toml is is-terminal, which once 1.73.0 is released, criterion package can use IsTerminal from std. Still, it's up to maintainers of the package.
Since criterion is a dev-dependency, it should be less likely to be downgraded. I am going to merge this.

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 24, 2023

📌 Commit 277368d has been approved by weihanglo

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 Sep 24, 2023
@bors
Copy link
Collaborator

bors commented Sep 24, 2023

⌛ Testing commit 277368d with merge c031b0c...

@bors
Copy link
Collaborator

bors commented Sep 24, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing c031b0c to master...

@bors bors merged commit c031b0c into rust-lang:master Sep 24, 2023
22 checks passed
@weihanglo weihanglo mentioned this pull request Sep 27, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 27, 2023
@bors
Auto merge of rust-lang#116189 - weihanglo:update-cargo, r=weihanglo
d206f2c 
Update cargo

11 commits in 414d9e3a6d8096f3e276234ce220c868767a8792..e6aabe8b3fcf639be3a5bf68e77853bd7b3fa27d
2023-09-22 07:03:57 +0000 to 2023-09-26 16:31:53 +0000
- Use full target spec for `cargo rustc --print --target` (rust-lang/cargo#12743)
- feat(embedded): Hack in code fence support (rust-lang/cargo#12681)
- chore(ci): Update Renovate schema (rust-lang/cargo#12741)
- more specific registry index not found msg (rust-lang/cargo#12732)
- docs: warn about upload timeout (rust-lang/cargo#12733)
- Fix some typos (rust-lang/cargo#12730)
- upgrade gitoxide to v0.54 (rust-lang/cargo#12731)
- Update target-arch-aware crates to support mips r6 targets (rust-lang/cargo#12720)
- Buffer console status messages. (rust-lang/cargo#12727)
- Fix spurious errors with networking tests. (rust-lang/cargo#12726)
- refactor(SourceId): merge `name` and `alt_registry_key` into one enum (rust-lang/cargo#12675)

r? ghost
@ehuss ehuss added this to the 1.74.0 milestone Sep 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weihanglo weihanglo weihanglo approved these changes

Assignees

@epage epage

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.74.0
Development

Successfully merging this pull request may close these issues.
6 participants
@chenx97 @rustbot @weihanglo @bors @ehuss @epage