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.

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

gcc: fix implication order in assertion #217977

Merged
merged 1 commit into from Feb 25, 2023
Merged

gcc: fix implication order in assertion #217977

merged 1 commit into from Feb 25, 2023

Conversation

ghost
Copy link

@ghost ghost commented Feb 24, 2023

Description of changes

In 6812dd9 I mistakenly had the implication order reversed. This commit corrects that mistake.

The original assertion (which is correct) was the following, which asserts that if you enable the GDB plugin, you must enable plugins generally (there is shared infrastructure):

assert enableGdbPlugin -> enablePlugin;

When the option name was changed to disableGdbPlugin, I
incorrectly wrote:

assert disableGdbPlugin -> enablePlugin;

And then again incorrectly wrote:

assert disableGdbPlugin -> !enablePlugin;

This commit uses the correct equivalent for the first statement,
which is the contrapositive:

assert !enablePlugin -> disableGdbPlugin;
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

In 6812dd9 I mistakenly had the
implication order reversed.  This commit corrects that mistake.

The original assertion (which is correct) was the following, which
asserts that if you enable the GDB plugin, you must enable plugins
generally (there is shared infrastructure):

```
assert enableGdbPlugin -> enablePlugin;
```

When the option name was changed to `disableGdbPlugin`, I
incorrectly wrote:

```
assert disableGdbPlugin -> enablePlugin;
```

And then again incorrectly wrote:

```
assert disableGdbPlugin -> !enablePlugin;
```

This commit uses the correct equivalent for the first statement,
which is the contrapositive:

```
assert !enablePlugin -> disableGdbPlugin;
```
@ghost ghost requested a review from matthewbauer as a code owner February 24, 2023 07:01
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Feb 24, 2023
@ghost ghost requested review from trofi and removed request for matthewbauer February 25, 2023 03:44
@trofi trofi merged commit 504c4fd into NixOS:staging Feb 25, 2023
@ghost ghost deleted the pr/gcc/fix-plugin-order-assertion branch March 7, 2023 09:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant