aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Mitchener <bruce.mitchener@gmail.com>2024-07-12 22:00:24 +0700
committerGitHub <noreply@github.com>2024-07-12 17:00:24 +0200
commit23c0c05a5bfb1bc95efa974204c9521aba97186c (patch)
tree8a9488e5141e546f114d876d4a4068d4899b03e3
parent01dd2001525850ef0d66374c69e98e1560cb6421 (diff)
downloadrapier-23c0c05a5bfb1bc95efa974204c9521aba97186c.tar.gz
rapier-23c0c05a5bfb1bc95efa974204c9521aba97186c.tar.bz2
rapier-23c0c05a5bfb1bc95efa974204c9521aba97186c.zip
Use `bitflags!` consistently. (#680)
This removes an `extern crate` and a `use` so that we always call it via `bitflags::bitflags!` everywhere.
-rw-r--r--src/geometry/interaction_groups.rs4
-rw-r--r--src_testbed/lib.rs3
-rw-r--r--src_testbed/testbed.rs4
3 files changed, 3 insertions, 8 deletions
diff --git a/src/geometry/interaction_groups.rs b/src/geometry/interaction_groups.rs
index f61de1a..10ba783 100644
--- a/src/geometry/interaction_groups.rs
+++ b/src/geometry/interaction_groups.rs
@@ -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)]
diff --git a/src_testbed/lib.rs b/src_testbed/lib.rs
index 2cb002a..24c7c8d 100644
--- a/src_testbed/lib.rs
+++ b/src_testbed/lib.rs
@@ -3,9 +3,6 @@
extern crate nalgebra as na;
-#[macro_use]
-extern crate bitflags;
-
#[cfg(feature = "log")]
#[macro_use]
extern crate log;
diff --git a/src_testbed/testbed.rs b/src_testbed/testbed.rs
index a9d40fe..5c0a804 100644
--- a/src_testbed/testbed.rs
+++ b/src_testbed/testbed.rs
@@ -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;
@@ -91,7 +91,7 @@ bitflags! {
}
}
-bitflags! {
+bitflags::bitflags! {
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
pub struct TestbedActionFlags: u32 {
const RESET_WORLD_GRAPHICS = 1 << 0;