From ea9f3722297950e824d2787540a20b170d361ed0 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <me@steffo.eu>
Date: Tue, 17 Dec 2024 10:30:28 +0100
Subject: [PATCH] `astreams`: Merge core and extended into activitystreams

---
 acrate_astreams/src/activitystreams.rs | 6 ++++++
 acrate_astreams/src/core.rs            | 6 ------
 acrate_astreams/src/extended.rs        | 6 ------
 acrate_astreams/src/lib.rs             | 4 +---
 4 files changed, 7 insertions(+), 15 deletions(-)
 create mode 100644 acrate_astreams/src/activitystreams.rs
 delete mode 100644 acrate_astreams/src/core.rs
 delete mode 100644 acrate_astreams/src/extended.rs

diff --git a/acrate_astreams/src/activitystreams.rs b/acrate_astreams/src/activitystreams.rs
new file mode 100644
index 0000000..ac4fbd7
--- /dev/null
+++ b/acrate_astreams/src/activitystreams.rs
@@ -0,0 +1,6 @@
+//! Struct definitions for ActivityStreams Core and Extended Types.
+//!
+//! # Specification
+//!
+//! - <https://www.w3.org/TR/activitystreams-vocabulary/>
+//!
diff --git a/acrate_astreams/src/core.rs b/acrate_astreams/src/core.rs
deleted file mode 100644
index 66f3976..0000000
--- a/acrate_astreams/src/core.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-//! Struct definitions for ActivityStreams Core Types.
-//!
-//! # Specification
-//!
-//! - <https://www.w3.org/TR/activitystreams-vocabulary/#types>
-//!
diff --git a/acrate_astreams/src/extended.rs b/acrate_astreams/src/extended.rs
deleted file mode 100644
index e478929..0000000
--- a/acrate_astreams/src/extended.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-//! Struct definitions for ActivityStreams Extended Types.
-//!
-//! # Specification
-//!
-//! - <https://www.w3.org/TR/activitystreams-vocabulary/#extendedtypes>
-//!
diff --git a/acrate_astreams/src/lib.rs b/acrate_astreams/src/lib.rs
index acb736b..c7e2f71 100644
--- a/acrate_astreams/src/lib.rs
+++ b/acrate_astreams/src/lib.rs
@@ -1,7 +1,5 @@
 
-pub mod core;
-pub mod extended;
-
+pub mod activitystreams;
 pub mod mastodon;
 pub mod miajetzt;
 pub mod litepub;