[pull] master from ruuda:master

.appveyor.yml

@@ -1,40 +1,32 @@
-environment:
-  matrix:
-    # Test every fourth release since the minimum supported version, to not
-    # waste too many resources. The list is already quite long.
-    - target: 1.8.0-x86_64-pc-windows-msvc
-    - target: 1.8.0-i686-pc-windows-msvc
-    - target: 1.12.0-x86_64-pc-windows-msvc
-    - target: 1.12.0-i686-pc-windows-msvc
-    - target: 1.16.0-x86_64-pc-windows-msvc
-    - target: 1.16.0-i686-pc-windows-msvc
-    - target: 1.20.0-x86_64-pc-windows-msvc
-    - target: 1.20.0-i686-pc-windows-msvc
-    - target: beta-x86_64-pc-windows-msvc
-    - target: beta-i686-pc-windows-msvc
-    - target: beta-x86_64-pc-windows-gnu
-    - target: beta-i686-pc-windows-gnu
-    - target: nightly-x86_64-pc-windows-msvc
-    - target: nightly-i686-pc-windows-msvc
-    - target: nightly-x86_64-pc-windows-gnu
-    - target: nightly-i686-pc-windows-gnu
-
-install:
-  # Download the Rust and Cargo installer.
-  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:target}.msi"
-
-  # Install Rust and Cargo and wait for installation to finish by using Write-Output.
-  - ps: msiexec /package "rust-${env:target}.msi" /quiet /norestart | Write-Output
-
-  # Pick up the new Path variable after the installer modified it.
-  - ps: $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine")
-
-  # Print versions for future reference.
-  - rustc --version
-  - cargo --version
-
-build_script:
-  - cargo build
-
-test_script:
-  - cargo test
+# This file is generated from build.rcl.
+{
+  "build_script": ["cargo build"],
+  "environment": {
+    "matrix": [
+      {"target": "1.60.0-x86_64-pc-windows-msvc"},
+      {"target": "1.60.0-i686-pc-windows-msvc"},
+      {"target": "1.70.0-x86_64-pc-windows-msvc"},
+      {"target": "1.70.0-i686-pc-windows-msvc"},
+      {"target": "beta-x86_64-pc-windows-msvc"},
+      {"target": "beta-i686-pc-windows-msvc"},
+      {"target": "nightly-x86_64-pc-windows-msvc"},
+      {"target": "nightly-i686-pc-windows-msvc"},
+      {"target": "beta-x86_64-pc-windows-gnu"},
+      {"target": "beta-i686-pc-windows-gnu"}
+    ]
+  },
+  "install": [
+    {
+      "ps": "Start-FileDownload \"https://static.rust-lang.org/dist/rust-${env:target}.msi\""
+    },
+    {
+      "ps": "msiexec /package \"rust-${env:target}.msi\" /quiet /norestart | Write-Output"
+    },
+    {
+      "ps": "$env:Path = [System.Environment]::GetEnvironmentVariable(\"Path\",\"Machine\")"
+    },
+    "rustc --version",
+    "cargo --version"
+  ],
+  "test_script": ["cargo test"]
+}

.github/workflows/build.yml

@@ -0,0 +1,108 @@
+# This file is generated from build.rcl.
+{
+  "env": {"CARGO_TERM_COLOR": "always"},
+  "jobs": {
+    "native-1-60-0": {
+      "runs-on": "ubuntu-latest",
+      "steps": [
+        {"uses": "actions/[email protected]"},
+        {
+          "name": "Install toolchain",
+          "run": "rustup toolchain install 1.60.0\nrustup target add x86_64-unknown-linux-gnu --toolchain 1.60.0\n"
+        },
+        {
+          "name": "Build",
+          "run": "cargo +1.60.0 build --target x86_64-unknown-linux-gnu --verbose"
+        },
+        {
+          "name": "Run tests",
+          "run": "cargo +1.60.0 test --target x86_64-unknown-linux-gnu --verbose"
+        }
+      ]
+    },
+    "native-1-70-0": {
+      "runs-on": "ubuntu-latest",
+      "steps": [
+        {"uses": "actions/[email protected]"},
+        {
+          "name": "Install toolchain",
+          "run": "rustup toolchain install 1.70.0\nrustup target add x86_64-unknown-linux-gnu --toolchain 1.70.0\n"
+        },
+        {
+          "name": "Build",
+          "run": "cargo +1.70.0 build --target x86_64-unknown-linux-gnu --verbose"
+        },
+        {
+          "name": "Run tests",
+          "run": "cargo +1.70.0 test --target x86_64-unknown-linux-gnu --verbose"
+        }
+      ]
+    },
+    "native-beta": {
+      "runs-on": "ubuntu-latest",
+      "steps": [
+        {"uses": "actions/[email protected]"},
+        {
+          "name": "Install toolchain",
+          "run": "rustup toolchain install beta\nrustup target add x86_64-unknown-linux-gnu --toolchain beta\n"
+        },
+        {
+          "name": "Build",
+          "run": "cargo +beta build --target x86_64-unknown-linux-gnu --verbose"
+        },
+        {
+          "name": "Run tests",
+          "run": "cargo +beta test --target x86_64-unknown-linux-gnu --verbose"
+        }
+      ]
+    },
+    "native-nightly": {
+      "runs-on": "ubuntu-latest",
+      "steps": [
+        {"uses": "actions/[email protected]"},
+        {
+          "name": "Install toolchain",
+          "run": "rustup toolchain install nightly\nrustup target add x86_64-unknown-linux-gnu --toolchain nightly\n"
+        },
+        {
+          "name": "Build",
+          "run": "cargo +nightly build --target x86_64-unknown-linux-gnu --verbose"
+        },
+        {
+          "name": "Run tests",
+          "run": "cargo +nightly test --target x86_64-unknown-linux-gnu --verbose"
+        }
+      ]
+    },
+    "sgx-msrv": {
+      "runs-on": "ubuntu-latest",
+      "steps": [
+        {"uses": "actions/[email protected]"},
+        {
+          "name": "Install toolchain",
+          "run": "rustup toolchain install 1.60.0\nrustup target add x86_64-fortanix-unknown-sgx --toolchain 1.60.0\n"
+        },
+        {
+          "name": "Build",
+          "run": "cargo +1.60.0 build --target x86_64-fortanix-unknown-sgx --verbose"
+        }
+      ]
+    },
+    "wasm-msrv": {
+      "runs-on": "ubuntu-latest",
+      "steps": [
+        {"uses": "actions/[email protected]"},
+        {
+          "name": "Install toolchain",
+          "run": "rustup toolchain install 1.60.0\nrustup target add wasm32-unknown-unknown --toolchain 1.60.0\n"
+        },
+        {
+          "name": "Build",
+          "run": "cargo +1.60.0 build --target wasm32-unknown-unknown --verbose"
+        }
+      ]
+    }
+  },
+  "name": "Build",
+  "on": {"pull_request": {"branches": ["master"]}, "push": {"branches": ["*"]}}
+}

Cargo.toml

@@ -1,23 +1,17 @@
 [package]
 name = "thread-id"
-version = "3.3.0"
+version = "5.0.0"
 authors = ["Ruud van Asseldonk <[email protected]>"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 readme = "readme.md"
 keywords = ["thread", "pthread", "getcurrentthreadid"]
 description = "Get a unique thread ID"
 repository = "https://github.com/ruuda/thread-id"
 documentation = "https://docs.rs/thread-id"
-
-[badges]
-travis-ci = { repository = "ruuda/thread-id", branch = "v3.3.0" }
-appveyor = { repository = "ruuda/thread-id", branch = "v3.3.0" }
+edition = "2021"
 
 [target.'cfg(unix)'.dependencies]
-libc = "0.2.6"
+libc = "0.2.147"
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["processthreadsapi"] }
-
-[target.'cfg(target_os = "redox")'.dependencies]
-redox_syscall = "0.1"
+windows-sys = { version = "0.59", features = ["Win32_System_Threading"] }