Merge pull request #370 from maciejhirsz/logos

chore(lib): back from logos2 to logos

Cargo.toml

@@ -16,7 +16,7 @@ rust-version = "1.65.0"
 version = "0.14.0"
 
 [package]
-name = "logos2"
+name = "logos"
 authors.workspace = true
 categories.workspace = true
 description.workspace = true
@@ -34,20 +34,19 @@ msrv = "1.65.0"  # Needed to duplicate, because cargo-msrv does not support work
 
 [package.metadata.release]
 pre-release-replacements = [
-  {file="book/src/getting-started.md", search="logos2 = \"[0-9]+\\.[0-9]+\\.[0-9]+\"", replace="logos2 = \"{{version}}\"", exactly=1},
+  {file="book/src/getting-started.md", search="logos = \"[0-9]+\\.[0-9]+\\.[0-9]+\"", replace="logos2 = \"{{version}}\"", exactly=1},
 ]
 shared-version = true
 
 [lib]
 bench = false
-name = "logos"
 
 [features]
 default = ["export_derive", "std"]
 # Re-exports the `Logos` derive macro, so that end user only needs to
 # import this crate and `use logos::Logos` to get both the trait and
 # derive proc macro.
-export_derive = ["logos-derive2"]
+export_derive = ["logos-derive"]
 # Should the crate use the standard library?
 std = []
 
@@ -61,7 +60,7 @@ bench = {lto = true}
 release = {lto = true}
 
 [dependencies]
-logos-derive2 = {version = "0.14.0", path = "./logos-derive", optional = true}
+logos-derive = {version = "0.14.0", path = "./logos-derive", optional = true}
 
 [dev-dependencies]
 ariadne = {version = "0.2.0", features = ["auto-color"]}

README.md

@@ -1,10 +1,5 @@
 <img src="https://raw.githubusercontent.com/maciejhirsz/logos/master/logos.svg?sanitize=true" alt="Logos logo" width="250" align="right">
 
-> **Warning**: as of v0.14, Logos is released under `logos2`,
-> see [#365](https://github.com/maciejhirsz/logos/pull/365). However, the library name
-> is still `logos`, so you should only change your dependencies in `Cargo.toml` to
-> use the latest versions.
-
 # Logos
 
 ![Test](https://github.com/maciejhirsz/logos/workflows/Test/badge.svg?branch=master)

book/src/getting-started.md

@@ -4,14 +4,7 @@
 
 ```toml
 [dependencies]
-logos2 = "0.14.0"
-```
-
-```admonish warning
-As of v0.14, Logos is released under `logos2`,
-see [#365](https://github.com/maciejhirsz/logos/pull/365). However, the library name
-is still `logos`, so you should only change your dependencies in `Cargo.toml` to
-use the latest versions.
+logos = "0.14.0"
 ```
 
 Then, you can automatically derive the [`Logos`](https://docs.rs/logos2/latest/logos/trait.Logos.html) trait on your `enum` using the `Logos` derive macro:

logos-cli/Cargo.toml

@@ -1,13 +1,8 @@
-[[bin]]
-bench = false
-name = "logos-cli"
-path = "src/main.rs"
-
 [dependencies]
 anyhow = "1.0.57"
 clap = {version = "3.1.18", features = ["derive"]}
 fs-err = "2.7.0"
-logos-codegen2 = {version = "0.14.0", path = "../logos-codegen"}
+logos-codegen = {version = "0.14.0", path = "../logos-codegen"}
 proc-macro2 = "1.0.39"
 
 [dev-dependencies]
@@ -16,7 +11,7 @@ assert_fs = "1.0.7"
 predicates = "2.1.1"
 
 [package]
-name = "logos-cli2"
+name = "logos-cli"
 authors.workspace = true
 categories.workspace = true
 description.workspace = true

logos-codegen/Cargo.toml

@@ -12,10 +12,9 @@ pretty_assertions = "1.4.0"
 
 [lib]
 bench = false
-name = "logos_codegen"
 
 [package]
-name = "logos-codegen2"
+name = "logos-codegen"
 authors.workspace = true
 categories.workspace = true
 description.workspace = true

logos-derive/Cargo.toml

@@ -1,13 +1,12 @@
 [dependencies]
-logos-codegen2 = {version = "0.14.0", path = "../logos-codegen"}
+logos-codegen = {version = "0.14.0", path = "../logos-codegen"}
 
 [lib]
 bench = false
-name = "logos_derive"
 proc-macro = true
 
 [package]
-name = "logos-derive2"
+name = "logos-derive"
 authors.workspace = true
 categories.workspace = true
 description.workspace = true

tests/Cargo.toml

@@ -5,8 +5,8 @@ publish = false
 version = "0.1.0"
 
 [dependencies]
-logos-derive2 = {path = "../logos-derive"}
-logos2 = {path = "../", default-features = false, features = ["std"]}
+logos-derive = {path = "../logos-derive"}
+logos = {path = "../", default-features = false, features = ["std"]}
 
 [dev-dependencies]
 criterion = "0.4"