From 0e6b874d5d03d916ecde2ff7053991a0f36796da Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Thu, 2 Apr 2020 11:36:15 -0500
Subject: [PATCH] Don't pluralize when endswith s

---
 Cargo.toml                        | 4 ++--
 README.md                         | 4 ++--
 activitystreams-derive/Cargo.toml | 2 +-
 activitystreams-derive/README.md  | 2 +-
 activitystreams-derive/src/lib.rs | 8 +++++---
 src/lib.rs                        | 4 ++--
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index cc47691..b55ce44 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "activitystreams"
 description = "Activity Streams in Rust"
-version = "0.5.0-alpha.14"
+version = "0.5.0-alpha.15"
 license = "GPL-3.0"
 authors = ["asonix <asonix@asonix.dog>"]
 repository = "https://git.asonix.dog/Aardwolf/activitystreams"
@@ -17,7 +17,7 @@ primitives = ["chrono", "mime", "serde", "thiserror", "url"]
 types = ["derive", "kinds", "primitives"]
 
 [dependencies]
-activitystreams-derive = { version = "0.5.0-alpha.6", path = "activitystreams-derive", optional = true}
+activitystreams-derive = { version = "0.5.0-alpha.7", path = "activitystreams-derive", optional = true}
 chrono = { version = "0.4", optional = true }
 mime = { version = "0.3", optional = true }
 serde = { version = "1.0", features = ["derive"], optional = true }
diff --git a/README.md b/README.md
index b361a34..af13245 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ __A set of Traits and Types that make up the ActivityStreams and ActivityPub spe
 
 First, add ActivityStreams to your dependencies
 ```toml
-activitystreams = "0.5.0-alpha.14"
+activitystreams = "0.5.0-alpha.15"
 ```
 
 ### Types
@@ -177,7 +177,7 @@ There are a number of features that can be disabled in this crate. By default, e
 enabled.
 
 ```toml
-activitystreams = { version = "0.5.0-alpha.14", default-features = "false", features = ["derive"] }
+activitystreams = { version = "0.5.0-alpha.15", default-features = "false", features = ["derive"] }
 ```
 
 | feature    | what you get                                              |
diff --git a/activitystreams-derive/Cargo.toml b/activitystreams-derive/Cargo.toml
index 83becbd..6a24ffe 100644
--- a/activitystreams-derive/Cargo.toml
+++ b/activitystreams-derive/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "activitystreams-derive"
 description = "Derive macros for activitystreams"
-version = "0.5.0-alpha.6"
+version = "0.5.0-alpha.7"
 license = "GPL-3.0"
 authors = ["asonix <asonix.dev@gmail.com>"]
 repository = "https://git.asonix.dog/Aardwolf/activitystreams"
diff --git a/activitystreams-derive/README.md b/activitystreams-derive/README.md
index 983dd0c..aeec80d 100644
--- a/activitystreams-derive/README.md
+++ b/activitystreams-derive/README.md
@@ -10,7 +10,7 @@ Add the required crates to your `Cargo.toml`
 ```toml
 # Cargo.toml
 
-activitystreams = "0.5.0-alpha.14"
+activitystreams = "0.5.0-alpha.15"
 serde = { version = "1.0", features = ["derive"] }
 ```
 
diff --git a/activitystreams-derive/src/lib.rs b/activitystreams-derive/src/lib.rs
index 7042082..c1b21de 100644
--- a/activitystreams-derive/src/lib.rs
+++ b/activitystreams-derive/src/lib.rs
@@ -23,8 +23,8 @@
 //!
 //! First, add `serde` and `activitystreams-derive` to your Cargo.toml
 //! ```toml
-//! activitystreams-derive = "0.5.0-alpha.6"
-//! # or activitystreams = "0.5.0-alpha.14"
+//! activitystreams-derive = "0.5.0-alpha.7"
+//! # or activitystreams = "0.5.0-alpha.15"
 //! serde = { version = "1.0", features = ["derive"] }
 //! ```
 //!
@@ -1537,8 +1537,10 @@ fn snakize(s: &str) -> String {
 }
 
 fn pluralize(s: String) -> String {
-    if s.ends_with('s') || s.ends_with('x') {
+    if s.ends_with('x') {
         s + "es"
+    } else if s.ends_with('s') {
+        s
     } else {
         s + "s"
     }
diff --git a/src/lib.rs b/src/lib.rs
index 8d8a8bf..fbe071d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -25,7 +25,7 @@
 //!
 //! First, add ActivityStreams to your dependencies
 //! ```toml
-//! activitystreams = "0.5.0-alpha.14"
+//! activitystreams = "0.5.0-alpha.15"
 //! ```
 //!
 //! ### Types
@@ -209,7 +209,7 @@
 //! enabled.
 //!
 //! ```toml
-//! activitystreams = { version = "0.5.0-alpha.14", default-features = "false", features = ["derive"] }
+//! activitystreams = { version = "0.5.0-alpha.15", default-features = "false", features = ["derive"] }
 //! ```
 //!
 //! | feature    | what you get                                              |