Fix failing CI build

- Update serenity 0.11.6 -> 0.11.5
- Update proc_macro2 1.0.47 -> 1.0.64
- Disambiguate several serenity re-exports
- Temporarily disable serenity/simdjson test since feature is broken upstream (serenity-rs/serenity#2474)

.github/workflows/ci.yml

@@ -39,10 +39,12 @@ jobs:
           - name: no features
             # don't test examples because they need collector feature
             command: cargo test --no-default-features --features serenity/rustls_backend --lib --tests
-
-          - name: all features + simdjson
-            command: cargo test --all-features --features serenity/simdjson --lib --tests --examples
-            rustflags: -C target-cpu=haswell # needed for simdjson
+
+          # TODO serentity/simdjson is broken. Re-enable once fixed upstream
+          # https://github.com/serenity-rs/serenity/issues/2474
+#          - name: all features + simdjson
+#            command: cargo test --all-features --features serenity/simdjson --lib --tests --examples
+#            rustflags: -C target-cpu=haswell # needed for simdjson
 
           - name: native TLS
             command: cargo test --all-features --features serenity/native_tls_backend --lib --tests --examples

Cargo.toml

@@ -23,7 +23,7 @@ parking_lot = "0.12.1"
 [dependencies.serenity]
 default-features = false
 features = ["builder", "client", "gateway", "model", "utils", "collector"]
-version = "0.11.5"
+version = "0.11.6"
 
 [dev-dependencies]
 # For the examples

src/lib.rs

@@ -430,6 +430,7 @@ pub mod serenity_prelude {
         async_trait,
         builder::*,
         client::{
+            self, // Resolve ambiguous re-export
             bridge::gateway::{event::*, *},
             *,
         },
@@ -445,6 +446,13 @@ pub mod serenity_prelude {
             // There's two MessageFlags in serenity. The interaction response specific one was
             // renamed to InteractionResponseFlags above so we can keep this one's name the same
             channel::MessageFlags,
+            // Disambiguate several types/modules where names are re-used within serenity
+            // In general, we prefer the model types as they are more relevant when using poise
+            error,
+            event::{self, EventType},
+            gateway,
+            guild::automod::Action,
+            prelude,
         },
         model::{
             application::{