Skip to content

Commit

Permalink
Merge #933
Browse files Browse the repository at this point in the history
933: v0.8: Prepare for the next release r=taiki-e a=taiki-e

Backports #932

Changes:
- crossbeam-epoch 0.9.13
  - Fix build script bug introduced in 0.9.12. (#932)
- crossbeam-queue 0.3.8
  - Fix build script bug introduced in 0.3.7. (#932)
- crossbeam-utils 0.8.14
  - Fix build script bug introduced in 0.8.13. (#932)

Co-authored-by: Cryptex <[email protected]>
Co-authored-by: Taiki Endo <[email protected]>
  • Loading branch information
3 people authored Nov 22, 2022
2 parents 44353df + 4c4298a commit 366276a
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build-common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
// so that mapping to rust standard targets happens correctly.
fn convert_custom_linux_target(target: String) -> String {
let mut parts: Vec<&str> = target.split('-').collect();
let system = parts[2];
if system == "linux" {
let system = parts.get(2);
if system == Some(&"linux") {
parts[1] = "unknown";
};
parts.join("-")
Expand Down
6 changes: 6 additions & 0 deletions crossbeam-epoch/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Version 0.9.13

- Fix build script bug introduced in 0.9.12. (#932)

# Version 0.9.12

**Note:** This release has been yanked due to regression fixed in 0.9.13.

- Update `memoffset` to 0.7. (#926)
- Improve support for custom targets. (#922)

Expand Down
2 changes: 1 addition & 1 deletion crossbeam-epoch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name = "crossbeam-epoch"
# - Update CHANGELOG.md
# - Update README.md
# - Create "crossbeam-epoch-X.Y.Z" git tag
version = "0.9.12"
version = "0.9.13"
edition = "2018"
rust-version = "1.38"
license = "MIT OR Apache-2.0"
Expand Down
6 changes: 6 additions & 0 deletions crossbeam-queue/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Version 0.3.8

- Fix build script bug introduced in 0.3.7. (#932)

# Version 0.3.7

**Note:** This release has been yanked due to regression fixed in 0.3.8.

- Improve support for custom targets. (#922)

# Version 0.3.6
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-queue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name = "crossbeam-queue"
# - Update CHANGELOG.md
# - Update README.md
# - Create "crossbeam-queue-X.Y.Z" git tag
version = "0.3.7"
version = "0.3.8"
edition = "2018"
rust-version = "1.38"
license = "MIT OR Apache-2.0"
Expand Down
6 changes: 6 additions & 0 deletions crossbeam-utils/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Version 0.8.14

- Fix build script bug introduced in 0.8.13. (#932)

# Version 0.8.13

**Note:** This release has been yanked due to regression fixed in 0.8.14.

- Improve support for custom targets. (#922)

# Version 0.8.12
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name = "crossbeam-utils"
# - Update CHANGELOG.md
# - Update README.md
# - Create "crossbeam-utils-X.Y.Z" git tag
version = "0.8.13"
version = "0.8.14"
edition = "2018"
rust-version = "1.38"
license = "MIT OR Apache-2.0"
Expand Down

0 comments on commit 366276a

Please sign in to comment.