Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.8: Prepare for the next release #929

Merged
merged 4 commits into from Nov 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions build-common.rs
@@ -0,0 +1,13 @@
// The target triplets have the form of 'arch-vendor-system'.
//
// When building for Linux (e.g. the 'system' part is
// 'linux-something'), replace the vendor with 'unknown'
// 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" {
parts[1] = "unknown";
};
parts.join("-")
}
5 changes: 5 additions & 0 deletions crossbeam-epoch/CHANGELOG.md
@@ -1,3 +1,8 @@
# Version 0.9.12

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

# Version 0.9.11

- Removes the dependency on the `once_cell` crate to restore the MSRV. (#913)
Expand Down
4 changes: 2 additions & 2 deletions crossbeam-epoch/Cargo.toml
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.11"
version = "0.9.12"
edition = "2018"
rust-version = "1.38"
license = "MIT OR Apache-2.0"
Expand Down Expand Up @@ -47,7 +47,7 @@ autocfg = "1"

[dependencies]
cfg-if = "1"
memoffset = "0.6"
memoffset = "0.7"
scopeguard = { version = "1.1", default-features = false }

# Enable the use of loom for concurrency testing.
Expand Down
1 change: 1 addition & 0 deletions crossbeam-epoch/build-common.rs
3 changes: 2 additions & 1 deletion crossbeam-epoch/build.rs
Expand Up @@ -15,10 +15,11 @@
use std::env;

include!("no_atomic.rs");
include!("build-common.rs");

fn main() {
let target = match env::var("TARGET") {
Ok(target) => target,
Ok(target) => convert_custom_linux_target(target),
Err(e) => {
println!(
"cargo:warning={}: unable to get TARGET environment variable: {}",
Expand Down
4 changes: 4 additions & 0 deletions crossbeam-queue/CHANGELOG.md
@@ -1,3 +1,7 @@
# Version 0.3.7

- Improve support for custom targets. (#922)

# Version 0.3.6

- Bump the minimum supported Rust version to 1.38. (#877)
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-queue/Cargo.toml
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.6"
version = "0.3.7"
edition = "2018"
rust-version = "1.38"
license = "MIT OR Apache-2.0"
Expand Down
1 change: 1 addition & 0 deletions crossbeam-queue/build-common.rs
3 changes: 2 additions & 1 deletion crossbeam-queue/build.rs
Expand Up @@ -15,10 +15,11 @@
use std::env;

include!("no_atomic.rs");
include!("build-common.rs");

fn main() {
let target = match env::var("TARGET") {
Ok(target) => target,
Ok(target) => convert_custom_linux_target(target),
Err(e) => {
println!(
"cargo:warning={}: unable to get TARGET environment variable: {}",
Expand Down
1 change: 1 addition & 0 deletions crossbeam-skiplist/build-common.rs
3 changes: 2 additions & 1 deletion crossbeam-skiplist/build.rs
Expand Up @@ -15,10 +15,11 @@
use std::env;

include!("no_atomic.rs");
include!("build-common.rs");

fn main() {
let target = match env::var("TARGET") {
Ok(target) => target,
Ok(target) => convert_custom_linux_target(target),
Err(e) => {
println!(
"cargo:warning={}: unable to get TARGET environment variable: {}",
Expand Down
4 changes: 4 additions & 0 deletions crossbeam-utils/CHANGELOG.md
@@ -1,3 +1,7 @@
# Version 0.8.13

- Improve support for custom targets. (#922)

# Version 0.8.12

- Removes the dependency on the `once_cell` crate to restore the MSRV. (#913)
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-utils/Cargo.toml
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.12"
version = "0.8.13"
edition = "2018"
rust-version = "1.38"
license = "MIT OR Apache-2.0"
Expand Down
1 change: 1 addition & 0 deletions crossbeam-utils/build-common.rs
3 changes: 2 additions & 1 deletion crossbeam-utils/build.rs
Expand Up @@ -27,10 +27,11 @@
use std::env;

include!("no_atomic.rs");
include!("build-common.rs");

fn main() {
let target = match env::var("TARGET") {
Ok(target) => target,
Ok(target) => convert_custom_linux_target(target),
Err(e) => {
println!(
"cargo:warning={}: unable to get TARGET environment variable: {}",
Expand Down
2 changes: 2 additions & 0 deletions no_atomic.rs
Expand Up @@ -37,6 +37,7 @@ const NO_ATOMIC_64: &[&str] = &[
"mips-unknown-linux-musl",
"mips-unknown-linux-uclibc",
"mipsel-sony-psp",
"mipsel-sony-psx",
"mipsel-unknown-linux-gnu",
"mipsel-unknown-linux-musl",
"mipsel-unknown-linux-uclibc",
Expand Down Expand Up @@ -73,6 +74,7 @@ const NO_ATOMIC_64: &[&str] = &[
#[allow(dead_code)] // Only crossbeam-utils uses this.
const NO_ATOMIC: &[&str] = &[
"avr-unknown-gnu-atmega328",
"mipsel-sony-psx",
"msp430-none-elf",
"riscv32i-unknown-none-elf",
"riscv32im-unknown-none-elf",
Expand Down