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

Initiate the inner usage of cfg_match (Library) #116342

Closed
wants to merge 1 commit into from
Closed

Initiate the inner usage of cfg_match (Library) #116342

wants to merge 1 commit into from

Conversation

c410-f3r
Copy link
Contributor

@c410-f3r c410-f3r commented Oct 2, 2023 •
edited
Loading

cc #115585

Continuation of #116312

@rustbot
Copy link
Collaborator

rustbot commented Oct 2, 2023

r? @cuviper

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

@rustbot rustbot added O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-wasm Target: WASM (WebAssembly), http://webassembly.org/ O-windows Operating system: Windows S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Oct 2, 2023
@c410-f3r c410-f3r changed the title Initiate the inner usage of cfg_match (Library) Initiate the inner usage of cfg_match (Library) Oct 2, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Oct 2, 2023

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@c410-f3r
Copy link
Contributor Author

c410-f3r commented Oct 8, 2023

r? libs

@rustbot rustbot assigned m-ou-se and unassigned cuviper Oct 8, 2023
@bors
Copy link
Contributor

bors commented Oct 14, 2023

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

@c410-f3r
Copy link
Contributor Author

c410-f3r commented Oct 19, 2023 •
edited
Loading

r? libs

@rustbot
Copy link
Collaborator

rustbot commented Oct 19, 2023

Some changes occurred in src/tools/cargo

cc @ehuss

@rustbot rustbot assigned Mark-Simulacrum and unassigned m-ou-se Oct 19, 2023
@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 18, 2024
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
Submodule path 'src/doc/rust-by-example': checked out 'e188d5d466f7f3ff9f1d518393235f4fe951be46'
From https://github.com/rust-lang/rustc-dev-guide
 * branch            1f30cc7cca9a3433bc1872abdc98960b36c21ca0 -> FETCH_HEAD
Submodule path 'src/doc/rustc-dev-guide': checked out '1f30cc7cca9a3433bc1872abdc98960b36c21ca0'
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.
##[error]Process completed with exit code 143.

@c410-f3r
Copy link
Contributor Author

c410-f3r commented Feb 18, 2024 •
edited
Loading

Attempting with retry: sh -c git submodule deinit -f src/doc/nomicon src/tools/cargo src/doc/reference src/doc/book src/doc/rust-by-example library/stdarch src/doc/rustc-dev-guide src/doc/edition-guide src/llvm-project src/doc/embedded-book library/backtrace && git submodule sync && git submodule update -j 16 --init --recursive --depth 1 src/doc/nomicon src/tools/cargo src/doc/reference src/doc/book src/doc/rust-by-example library/stdarch src/doc/rustc-dev-guide src/doc/edition-guide src/llvm-project src/doc/embedded-book library/backtrace
error: could not lock config file .git/modules/library/backtrace/config: No such file or directory
warning: Could not unset core.worktree setting in submodule 'library/backtrace'
Cleared directory 'library/backtrace'
error: could not lock config file .git/modules/library/stdarch/config: No such file or directory
Cleared directory 'library/stdarch'
warning: Could not unset core.worktree setting in submodule 'library/stdarch'
error: could not lock config file .git/modules/src/doc/book/config: No such file or directory
warning: Could not unset core.worktree setting in submodule 'src/doc/book'
Cleared directory 'src/doc/book'
error: could not lock config file .git/modules/src/doc/edition-guide/config: No such file or directory
warning: Could not unset core.worktree setting in submodule 'src/doc/edition-guide'
Cleared directory 'src/doc/edition-guide'
error: could not lock config file .git/modules/src/doc/embedded-book/config: No such file or directory

Idk, looks unrelated

@Dylan-DPC
Copy link
Member

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Feb 18, 2024

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.

@bors
Copy link
Contributor

bors commented Feb 18, 2024

📌 Commit 131cc37 has been approved by Mark-Simulacrum

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 Feb 18, 2024
CKingX added a commit to CKingX/rust that referenced this pull request Feb 18, 2024
@CKingX
Rollup merge of rust-lang#116342 - c410-f3r:t3st3ss, r=Mark-Simulacrum
2a438a6 
Initiate the inner usage of `cfg_match` (Library)

cc rust-lang#115585

Continuation of rust-lang#116312
@CKingX CKingX mentioned this pull request Feb 18, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 19, 2024
@bors
Auto merge of rust-lang#116342 - c410-f3r:t3st3ss, r=Mark-Simulacrum
b95bc4b 
Initiate the inner usage of `cfg_match` (Library)

cc rust-lang#115585

Continuation of rust-lang#116312
@bors
Copy link
Contributor

bors commented Feb 19, 2024

⌛ Testing commit 131cc37 with merge b95bc4b...

@rust-log-analyzer
Copy link
Collaborator

The job dist-x86_64-illumos failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
[RUSTC-TIMING] object test:false 4.329
error: unused imports: `sigaddset`, `sigemptyset`
  --> library/std/src/sys/pal/unix/process/process_common.rs:82:24
   |
82 |         pub use libc::{sigemptyset, sigaddset};
   |
   = note: `-D unused-imports` implied by `-D warnings`
   = help: to override `-D warnings` add `#[allow(unused_imports)]`

@bors
Copy link
Contributor

bors commented Feb 19, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 19, 2024
@bors
Copy link
Contributor

bors commented Feb 19, 2024

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

@Dylan-DPC Dylan-DPC 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 Feb 20, 2024
@c410-f3r
Copy link
Contributor Author

c410-f3r commented Feb 20, 2024 •
edited
Loading

Sigh... Sorry @Mark-Simulacrum @Dylan-DPC, I don't have the energy or motivation to continue pursuing this PR.

@c410-f3r c410-f3r closed this Feb 20, 2024
@Dylan-DPC Dylan-DPC added the S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. label Feb 22, 2024
@kennytm kennytm mentioned this pull request Nov 12, 2024
Closed
@c410-f3r c410-f3r mentioned this pull request Nov 14, 2024
Open
3 tasks
@c410-f3r c410-f3r mentioned this pull request Dec 1, 2024
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 16, 2025
@matthiaskrgr
Rollup merge of rust-lang#133720 - c410-f3r:cfg-match-foo-bar-baz, r=…
1a07abf 
…joshtriplett

[cfg_match] Adjust syntax

A year has passed since the creation of rust-lang#115585 and the feature, as expected, is not moving forward. Let's change that.

This PR proposes changing the arm's syntax from  `cfg(SOME_CONDITION) => { ... }` to `SOME_CODITION => {}`.

```rust
match_cfg! {
   unix => {
        fn foo() { /* unix specific functionality */ }
    }
    target_pointer_width = "32" => {
        fn foo() { /* non-unix, 32-bit functionality */ }
    }
    _ => {
        fn foo() { /* fallback implementation */ }
    }
}
```

Why? Because after several manual migrations in rust-lang#116342 it became clear,  at least for me, that `cfg` prefixes are unnecessary, verbose and redundant.

Again, everything is just a proposal to move things forward. If the shown syntax isn't ideal, feel free to close this PR or suggest other alternatives.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 16, 2025
@matthiaskrgr
Rollup merge of rust-lang#133720 - c410-f3r:cfg-match-foo-bar-baz, r=…
79a1658 
…joshtriplett

[cfg_match] Adjust syntax

A year has passed since the creation of rust-lang#115585 and the feature, as expected, is not moving forward. Let's change that.

This PR proposes changing the arm's syntax from  `cfg(SOME_CONDITION) => { ... }` to `SOME_CODITION => {}`.

```rust
match_cfg! {
   unix => {
        fn foo() { /* unix specific functionality */ }
    }
    target_pointer_width = "32" => {
        fn foo() { /* non-unix, 32-bit functionality */ }
    }
    _ => {
        fn foo() { /* fallback implementation */ }
    }
}
```

Why? Because after several manual migrations in rust-lang#116342 it became clear,  at least for me, that `cfg` prefixes are unnecessary, verbose and redundant.

Again, everything is just a proposal to move things forward. If the shown syntax isn't ideal, feel free to close this PR or suggest other alternatives.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 16, 2025
@matthiaskrgr
Rollup merge of rust-lang#133720 - c410-f3r:cfg-match-foo-bar-baz, r=…
fca1481 
…joshtriplett

[cfg_match] Adjust syntax

A year has passed since the creation of rust-lang#115585 and the feature, as expected, is not moving forward. Let's change that.

This PR proposes changing the arm's syntax from  `cfg(SOME_CONDITION) => { ... }` to `SOME_CODITION => {}`.

```rust
match_cfg! {
   unix => {
        fn foo() { /* unix specific functionality */ }
    }
    target_pointer_width = "32" => {
        fn foo() { /* non-unix, 32-bit functionality */ }
    }
    _ => {
        fn foo() { /* fallback implementation */ }
    }
}
```

Why? Because after several manual migrations in rust-lang#116342 it became clear,  at least for me, that `cfg` prefixes are unnecessary, verbose and redundant.

Again, everything is just a proposal to move things forward. If the shown syntax isn't ideal, feel free to close this PR or suggest other alternatives.
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 16, 2025
@rust-timer
Unrolled build for rust-lang#133720
856ee09 
Rollup merge of rust-lang#133720 - c410-f3r:cfg-match-foo-bar-baz, r=joshtriplett

[cfg_match] Adjust syntax

A year has passed since the creation of rust-lang#115585 and the feature, as expected, is not moving forward. Let's change that.

This PR proposes changing the arm's syntax from  `cfg(SOME_CONDITION) => { ... }` to `SOME_CODITION => {}`.

```rust
match_cfg! {
   unix => {
        fn foo() { /* unix specific functionality */ }
    }
    target_pointer_width = "32" => {
        fn foo() { /* non-unix, 32-bit functionality */ }
    }
    _ => {
        fn foo() { /* fallback implementation */ }
    }
}
```

Why? Because after several manual migrations in rust-lang#116342 it became clear,  at least for me, that `cfg` prefixes are unnecessary, verbose and redundant.

Again, everything is just a proposal to move things forward. If the shown syntax isn't ideal, feel free to close this PR or suggest other alternatives.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-wasm Target: WASM (WebAssembly), http://webassembly.org/ O-windows Operating system: Windows S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@c410-f3r @rustbot @rust-log-analyzer @bors @Mark-Simulacrum @Dylan-DPC @cuviper @m-ou-se