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

Remove outdated tidy license fixmes #132560

Merged
merged 1 commit into from
Nov 4, 2024
Merged

Remove outdated tidy license fixmes #132560

merged 1 commit into from
Nov 4, 2024

Conversation

Urgau
Copy link
Member

@Urgau Urgau commented Nov 3, 2024 •
edited
Loading

This PR re-enables license dependency checking for:

  • the backtrace submodule
  • and the portable-simd subtree

The stdarch submodule doesn't have a Cargo.lock yet so we can't re-enable it.

This PR removes outdated tidy license fixmes, #132560 (comment).

r? bootstrap

@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) labels Nov 3, 2024
@rustbot
Copy link
Collaborator

rustbot commented Nov 3, 2024

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

@bjorn3
Copy link
Member

bjorn3 commented Nov 3, 2024

I don't think we are doing vendoring for those workspaces and thus cargo metadata would fail when offline. I think they should just be removed entirely from the license checker given that we don't directly build these workspaces anyway. We only use individual crates as dependencies of the library workspace, which will then result in those specific crates and their dependencies being included in the license check for the library workspace.

@Urgau
Copy link
Member Author

Urgau commented Nov 3, 2024

Quite possibly, I don't enough this space to know if you should do that instead.

I mainly just saw the fixme could be resolved. Happy to instead remove the lines completely if that's desired.

@bjorn3
Copy link
Member

bjorn3 commented Nov 3, 2024

When I added those fixme's I didn't yet realize that checking licenses for these workspaces would cause tidy to fail when there is no internet. As far as I'm concerned these fixmes should just be removed.

@Urgau Urgau force-pushed the tidy-license-deps branch from ce0555d to b3fc11b Compare November 3, 2024 19:41
@Urgau Urgau changed the title Re-enable license dependency checking for some workspace Remove outdated tidy license fixmes Nov 3, 2024
@onur-ozkan
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 3, 2024

📌 Commit b3fc11b has been approved by onur-ozkan

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 Nov 3, 2024
@workingjubilee workingjubilee mentioned this pull request Nov 3, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 4, 2024
@bors
Auto merge of rust-lang#132581 - workingjubilee:rollup-4wj318p, r=wor…
43c7805 
…kingjubilee

Rollup of 6 pull requests

Successful merges:

 - rust-lang#126136 (Call the target libdir target libdir)
 - rust-lang#132516 (Add bad-reg inline assembly ui test for RISC-V and s390x)
 - rust-lang#132521 (replace manual time convertions with std ones, comptime time format parsing)
 - rust-lang#132560 (Remove outdated tidy license fixmes)
 - rust-lang#132563 (Modify `NonZero` documentation to reference the underlying integer type)
 - rust-lang#132574 (compiler: Directly use rustc_abi almost everywhere)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit cf712a2 into rust-lang:master Nov 4, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Nov 4, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 4, 2024
@rust-timer
Unrolled build for rust-lang#132560
b2e5905 
Rollup merge of rust-lang#132560 - Urgau:tidy-license-deps, r=onur-ozkan

Remove outdated tidy license fixmes

~~This PR re-enables license dependency checking for:~~
 - ~~the `backtrace` submodule~~
 - ~~and the `portable-simd` subtree~~

~~The `stdarch` submodule doesn't have a `Cargo.lock` yet so we can't re-enable it.~~

This PR removes outdated tidy license fixmes, rust-lang#132560 (comment).

r? bootstrap
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@onur-ozkan onur-ozkan

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)
Projects
None yet
Milestone
1.84.0
Development

Successfully merging this pull request may close these issues.
5 participants
@Urgau @rustbot @bjorn3 @onur-ozkan @bors