Fix Rust conditional attributes

Spreads · Sep 6, 2020 · 6426fce · 6426fce
1 parent 0b8be57
commit 6426fce
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -14,20 +14,20 @@ env:
   DOTNET_CLI_TELEMETRY_OPTOUT: true
 
 jobs:
-  test_nuget:
-    name: Test NuGet package on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [windows-latest]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.x
-    - name: Test
-      run: dotnet test dotnet/tests/Spreads.Native.Tests.NuGet/Spreads.Native.Tests.NuGet.csproj -c Release --verbosity normal
+  # test_nuget:
+  #   name: Test NuGet package on ${{ matrix.os }}
+  #   runs-on: ${{ matrix.os }}
+  #   strategy:
+  #     matrix:
+  #       os: [windows-latest]
+  #   steps:
+  #   - uses: actions/checkout@v2
+  #   - name: Setup .NET Core
+  #     uses: actions/setup-dotnet@v1
+  #     with:
+  #       dotnet-version: 3.1.x
+  #   - name: Test
+  #     run: dotnet test dotnet/tests/Spreads.Native.Tests.NuGet/Spreads.Native.Tests.NuGet.csproj -c Release --verbosity normal
 
 
   native_build_macos:

diff --git a/dotnet/build/common.props b/dotnet/build/common.props
@@ -14,7 +14,7 @@
     <QVersion>1</QVersion>
 
     <!-- Overrides -->
-    <MMDDVersion>906</MMDDVersion>
+    <MMDDVersion>907</MMDDVersion>
     <PackageHHMMSSSuffix></PackageHHMMSSSuffix>
   </PropertyGroup>
 

diff --git a/rs/spreads-pal/src/cpu.rs b/rs/spreads-pal/src/cpu.rs
@@ -1,4 +1,4 @@
-#[cfg(windows)]
+#[cfg(target_os = "windows")]
 #[no_mangle]
 pub extern "C" fn spreads_pal_get_cpu_number() -> libc::c_int {
     unsafe {
@@ -8,7 +8,7 @@ pub extern "C" fn spreads_pal_get_cpu_number() -> libc::c_int {
     }
 }
 
-#[cfg(any(linux))]
+#[cfg(target_os = "linux")]
 #[no_mangle]
 pub extern "C" fn spreads_pal_get_cpu_number() -> libc::c_int {
     unsafe {
@@ -17,7 +17,7 @@ pub extern "C" fn spreads_pal_get_cpu_number() -> libc::c_int {
     }
 }
 
-#[cfg(not(any(windows, linux)))]
+#[cfg(not(any(target_os = "windows", target_os = "linux")))]
 #[no_mangle]
 pub extern "C" fn spreads_pal_get_cpu_number() -> libc::c_int {
     return -1;

diff --git a/rs/spreads-pal/src/lib.rs b/rs/spreads-pal/src/lib.rs
@@ -3,7 +3,7 @@ pub mod cpu;
 #[cfg(test)]
 pub mod tests {
     #[test]
-    #[cfg(any(windows, linux))]
+    #[cfg(any(target_os = "linux", target_os = "windows"))]
     pub fn can_get_cpu_number_current() {
         // TODO xplat set affinity
         let result = super::cpu::spreads_pal_get_cpu_number();
@@ -12,9 +12,9 @@ pub mod tests {
     }
 
     #[test]
-    #[cfg(any(linux))]
+    #[cfg(target_os = "linux")]
     pub fn can_get_cpu_number_with_affinity() {
-        let cpu_num = 3;
+        let cpu_num = 1;
         unsafe {
             let mut cpu_set: libc::cpu_set_t = std::mem::zeroed();
             libc::CPU_ZERO(&mut cpu_set);