From 9f6b96e461003853bf36052cfaf79b12e1c35413 Mon Sep 17 00:00:00 2001
From: Stefan Lankes <slankes@eonerc.rwth-aachen.de>
Date: Mon, 30 Mar 2020 07:37:52 +0200
Subject: [PATCH] move the definition of thread priorities to hermit-abi

---
 Cargo.lock                      |  4 ++--
 src/libstd/Cargo.toml           |  2 +-
 src/libstd/sys/hermit/thread.rs | 25 +------------------------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a0233124b84..e51eded2200 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1372,9 +1372,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ebe6e23502442c4c9cd80fcb8bdf867dc5f4a9e9f1d882499fa49c5ed83e559"
+checksum = "725cf19794cf90aa94e65050cb4191ff5d8fa87a498383774c47b332e3af952e"
 dependencies = [
  "compiler_builtins",
  "libc",
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index 1bb764897ea..3a83f3f569a 100644
--- a/src/libstd/Cargo.toml
+++ b/src/libstd/Cargo.toml
@@ -41,7 +41,7 @@ dlmalloc = { version = "0.1", features = ['rustc-dep-of-std'] }
 fortanix-sgx-abi = { version = "0.3.2", features = ['rustc-dep-of-std'] }
 
 [target.'cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"), target_os = "hermit"))'.dependencies]
-hermit-abi = { version = "0.1.9", features = ['rustc-dep-of-std'] }
+hermit-abi = { version = "0.1.10", features = ['rustc-dep-of-std'] }
 
 [target.wasm32-wasi.dependencies]
 wasi = { version = "0.9.0", features = ['rustc-dep-of-std'], default-features = false }
diff --git a/src/libstd/sys/hermit/thread.rs b/src/libstd/sys/hermit/thread.rs
index c3c29c93826..00d760d02e8 100644
--- a/src/libstd/sys/hermit/thread.rs
+++ b/src/libstd/sys/hermit/thread.rs
@@ -1,7 +1,6 @@
 #![allow(dead_code)]
 
 use crate::ffi::CStr;
-use crate::fmt;
 use crate::io;
 use crate::mem;
 use crate::sys::hermit::abi;
@@ -12,28 +11,6 @@
 
 pub type Tid = abi::Tid;
 
-/// Priority of a task
-#[derive(PartialEq, Eq, PartialOrd, Ord, Debug, Clone, Copy)]
-pub struct Priority(u8);
-
-impl Priority {
-    pub const fn into(self) -> u8 {
-        self.0
-    }
-
-    pub const fn from(x: u8) -> Self {
-        Priority(x)
-    }
-}
-
-impl fmt::Display for Priority {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-pub const NORMAL_PRIO: Priority = Priority::from(2);
-
 pub struct Thread {
     tid: Tid,
 }
@@ -55,7 +32,7 @@ pub unsafe fn new_with_coreid(
             &mut tid as *mut Tid,
             thread_start,
             &*p as *const _ as *const u8 as usize,
-            Priority::into(NORMAL_PRIO),
+            abi::Priority::into(abi::NORMAL_PRIO),
             core_id,
         );