Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix unused attribute on Windows. #11614

Merged
merged 1 commit into from
Jan 22, 2023
Merged

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jan 22, 2023

The change introduced in #11610 is causing unused_attribute warnings on Windows because there are two ignore attributes when CARGO_PUBLIC_NETWORK_TESTS is not set. The solution here is to make cargo_test support a hard-coded option for an additional reason to ignore a test.

Ideally I think this would use something like a cfg() expression, but those can't really be evaluated within the proc-macro (without pulling in cargo_platform). Could also just allow(unused_attributes), but that felt a little icky.

@rustbot
Copy link
Collaborator

rustbot commented Jan 22, 2023

r? @weihanglo

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 22, 2023
@ehuss ehuss force-pushed the fix-unused-attr-warn branch from dc4ef51 to 9247e81 Compare January 22, 2023 22:02
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.

I feel this is a bit more nasty than allow(unused_attributes) but don't really have objection to it. Let's move forward.

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jan 22, 2023

📌 Commit 9247e81 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 Jan 22, 2023
@bors
Copy link
Contributor

bors commented Jan 22, 2023

⌛ Testing commit 9247e81 with merge ca0557a...

@bors
Copy link
Contributor

bors commented Jan 22, 2023

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

@bors bors merged commit ca0557a into rust-lang:master Jan 22, 2023
bors pushed a commit to rust-lang-ci/rust that referenced this pull request Jan 25, 2023
11 commits in 985d561f0bb9b76ec043a2b12511790ec7a2b954..3c5af6bed9a1a243a693e8e22ee2486bd5b82a6c
2023-01-20 14:39:28 +0000 to 2023-01-24 15:48:15 +0000

- Add a note about verifying your email address on crates.io (rust-lang/cargo#11620)
- Improve CI caching by skipping mtime checks for paths in $CARGO_HOME (rust-lang/cargo#11613)
- test: Update for clap 4.1.3 (rust-lang/cargo#11619)
- Fix unused attribute on Windows. (rust-lang/cargo#11614)
- [Doc]: Added links to the `Target` section of the glossary for occurences of `target triple` (rust-lang/cargo#11603)
- feat: stabilize auto fix note (rust-lang/cargo#11558)
- Clarify the difference between CARGO_CRATE_NAME and CARGO_PKG_NAME (rust-lang/cargo#11576)
- Temporarily pin libgit2-sys. (rust-lang/cargo#11609)
- Disable network SSH tests on windows. (rust-lang/cargo#11610)
- fix(toml): Add `default-features` to `TomlWorkspaceDependency` (rust-lang/cargo#11409)
- doc(contrib): remove rls in release process (rust-lang/cargo#11601)
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 25, 2023
Update cargo

11 commits in 985d561f0bb9b76ec043a2b12511790ec7a2b954..3c5af6bed9a1a243a693e8e22ee2486bd5b82a6c 2023-01-20 14:39:28 +0000 to 2023-01-24 15:48:15 +0000

- Add a note about verifying your email address on crates.io (rust-lang/cargo#11620)
- Improve CI caching by skipping mtime checks for paths in $CARGO_HOME (rust-lang/cargo#11613)
- test: Update for clap 4.1.3 (rust-lang/cargo#11619)
- Fix unused attribute on Windows. (rust-lang/cargo#11614)
- [Doc]: Added links to the `Target` section of the glossary for occurences of `target triple` (rust-lang/cargo#11603)
- feat: stabilize auto fix note (rust-lang/cargo#11558)
- Clarify the difference between CARGO_CRATE_NAME and CARGO_PKG_NAME (rust-lang/cargo#11576)
- Temporarily pin libgit2-sys. (rust-lang/cargo#11609)
- Disable network SSH tests on windows. (rust-lang/cargo#11610)
- fix(toml): Add `default-features` to `TomlWorkspaceDependency` (rust-lang/cargo#11409)
- doc(contrib): remove rls in release process (rust-lang/cargo#11601)

r? `@ghost`
@ehuss ehuss added this to the 1.69.0 milestone Jan 28, 2023
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants