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

Use bitflags! consistently. #680

Merged
merged 1 commit into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/geometry/interaction_groups.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@ impl Default for InteractionGroups {
}
}

use bitflags::bitflags;

bitflags! {
bitflags::bitflags! {
/// A bit mask identifying groups for interaction.
#[cfg_attr(feature = "serde-serialize", derive(Serialize, Deserialize))]
#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)]
Expand Down
3 changes: 0 additions & 3 deletions src_testbed/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@

extern crate nalgebra as na;

#[macro_use]
extern crate bitflags;

#[cfg(feature = "log")]
#[macro_use]
extern crate log;
Expand Down
4 changes: 2 additions & 2 deletions src_testbed/testbed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ fn usage(exe_name: &str) {
info!(" --pause - do not start the simulation right away.");
}

bitflags! {
bitflags::bitflags! {
#[derive(Copy, Clone, PartialEq, Eq, Debug, Default)]
pub struct TestbedStateFlags: u32 {
const NONE = 0;
Expand All @@ -91,7 +91,7 @@ bitflags! {
}
}

bitflags! {
bitflags::bitflags! {
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
pub struct TestbedActionFlags: u32 {
const RESET_WORLD_GRAPHICS = 1 << 0;
Expand Down