Merge pull request #1024 from gtk-rs/bilelmoussaoui/priority

sdroege · web-flow · commit af2fc383d596 · 2023-03-12T10:24:33.000+02:00
glib: Switch Priority to associated constants
diff --git a/examples/gio_futures/main.rs b/examples/gio_futures/main.rs
@@ -34,7 +34,7 @@ fn main() {
 fn read_and_print_file(
     file: &gio::File,
 ) -> impl Future<Output = Result<(), String>> + std::marker::Unpin {
-    file.read_future(glib::PRIORITY_DEFAULT)
+    file.read_future(glib::Priority::default())
         .map_err(|err| format!("Failed to open file: {err}"))
         .and_then(read_and_print_chunks)
 }
@@ -96,7 +96,7 @@ fn read_and_print_next_chunk(
     idx: usize,
 ) -> impl Future<Output = Result<Option<Vec<u8>>, String>> + std::marker::Unpin {
     let strm_clone = strm.clone();
-    strm.read_future(buf, glib::PRIORITY_DEFAULT)
+    strm.read_future(buf, glib::Priority::default())
         .map_err(|(_buf, err)| format!("Failed to read from stream: {err}"))
         .and_then(move |(buf, len)| {
             println!("line {idx}: {:?}", str::from_utf8(&buf[0..len]).unwrap());
@@ -109,7 +109,7 @@ fn read_and_print_next_chunk(
             if len == 0 {
                 futures::future::Either::Left(
                     strm_clone
-                        .close_future(glib::PRIORITY_DEFAULT)
+                        .close_future(glib::Priority::default())
                         .map_err(|err| format!("Failed to close stream: {err}"))
                         .map_ok(|_| None),
                 )
diff --git a/examples/gio_futures_await/main.rs b/examples/gio_futures_await/main.rs
@@ -28,7 +28,7 @@ fn main() {
 async fn read_file(file: gio::File) -> Result<(), String> {
     // Try to open the file.
     let strm = file
-        .read_future(glib::PRIORITY_DEFAULT)
+        .read_future(glib::Priority::default())
         .map_err(|err| format!("Failed to open file: {err}"))
         .await?;
 
@@ -40,7 +40,7 @@ async fn read_file(file: gio::File) -> Result<(), String> {
 
     loop {
         let (b, len) = strm
-            .read_future(buf, glib::PRIORITY_DEFAULT)
+            .read_future(buf, glib::Priority::default())
             .map_err(|(_buf, err)| format!("Failed to read from stream: {err}"))
             .await?;
 
@@ -58,7 +58,7 @@ async fn read_file(file: gio::File) -> Result<(), String> {
     }
 
     // Asynchronously close the stream in the end.
-    strm.close_future(glib::PRIORITY_DEFAULT)
+    strm.close_future(glib::Priority::default())
         .map_err(|err| format!("Failed to close stream: {err}"))
         .await?;
 
diff --git a/examples/gio_task/file_size/ffi.rs b/examples/gio_task/file_size/ffi.rs
@@ -33,7 +33,11 @@ pub unsafe extern "C" fn my_file_size_get_file_size_async(
 
     glib::MainContext::ref_thread_default().spawn_local(async move {
         let size = gio::File::for_path("Cargo.toml")
-            .query_info_future("*", gio::FileQueryInfoFlags::NONE, glib::PRIORITY_DEFAULT)
+            .query_info_future(
+                "*",
+                gio::FileQueryInfoFlags::NONE,
+                glib::Priority::default(),
+            )
             .await
             .unwrap()
             .size();
diff --git a/examples/gio_task/file_size/mod.rs b/examples/gio_task/file_size/mod.rs
@@ -41,7 +41,11 @@ impl FileSize {
 
         glib::MainContext::ref_thread_default().spawn_local(async move {
             let size = gio::File::for_path("Cargo.toml")
-                .query_info_future("*", gio::FileQueryInfoFlags::NONE, glib::PRIORITY_DEFAULT)
+                .query_info_future(
+                    "*",
+                    gio::FileQueryInfoFlags::NONE,
+                    glib::Priority::default(),
+                )
                 .await
                 .unwrap()
                 .size();
diff --git a/gio/src/input_stream.rs b/gio/src/input_stream.rs
@@ -598,7 +598,7 @@ mod tests {
             let buf = vec![0; 10];
             strm.read_all_async(
                 buf,
-                glib::PRIORITY_DEFAULT_IDLE,
+                glib::Priority::DEFAULT_IDLE,
                 crate::Cancellable::NONE,
                 move |ret| {
                     tx.send(ret).unwrap();
@@ -653,7 +653,7 @@ mod tests {
             let buf = vec![0; 10];
             strm.read_async(
                 buf,
-                glib::PRIORITY_DEFAULT_IDLE,
+                glib::Priority::DEFAULT_IDLE,
                 crate::Cancellable::NONE,
                 move |ret| {
                     tx.send(ret).unwrap();
@@ -677,7 +677,7 @@ mod tests {
 
             strm.read_bytes_async(
                 10,
-                glib::PRIORITY_DEFAULT_IDLE,
+                glib::Priority::DEFAULT_IDLE,
                 crate::Cancellable::NONE,
                 move |ret| {
                     tx.send(ret).unwrap();
@@ -698,7 +698,7 @@ mod tests {
 
             strm.skip_async(
                 10,
-                glib::PRIORITY_DEFAULT_IDLE,
+                glib::Priority::DEFAULT_IDLE,
                 crate::Cancellable::NONE,
                 move |ret| {
                     tx.send(ret).unwrap();
diff --git a/gio/src/memory_input_stream.rs b/gio/src/memory_input_stream.rs
@@ -64,7 +64,7 @@ mod tests {
 
         let res = c
             .block_on(
-                strm.read_future(buf, glib::PRIORITY_DEFAULT)
+                strm.read_future(buf, glib::Priority::default())
                     .map_err(|(_buf, err)| err)
                     .map_ok(move |(mut buf, len)| {
                         buf.truncate(len);
diff --git a/gio/src/output_stream.rs b/gio/src/output_stream.rs
@@ -723,7 +723,7 @@ mod tests {
             strm.splice_async(
                 &input,
                 crate::OutputStreamSpliceFlags::CLOSE_SOURCE,
-                glib::PRIORITY_DEFAULT_IDLE,
+                glib::Priority::DEFAULT_IDLE,
                 crate::Cancellable::NONE,
                 move |ret| {
                     tx.send(ret).unwrap();
@@ -743,7 +743,7 @@ mod tests {
             let buf = vec![1, 2, 3];
             strm.write_async(
                 buf,
-                glib::PRIORITY_DEFAULT_IDLE,
+                glib::Priority::DEFAULT_IDLE,
                 crate::Cancellable::NONE,
                 move |ret| {
                     tx.send(ret).unwrap();
@@ -765,7 +765,7 @@ mod tests {
             let buf = vec![1, 2, 3];
             strm.write_all_async(
                 buf,
-                glib::PRIORITY_DEFAULT_IDLE,
+                glib::Priority::DEFAULT_IDLE,
                 crate::Cancellable::NONE,
                 move |ret| {
                     tx.send(ret).unwrap();
@@ -788,7 +788,7 @@ mod tests {
             let b = Bytes::from_owned(vec![1, 2, 3]);
             strm.write_bytes_async(
                 &b,
-                glib::PRIORITY_DEFAULT_IDLE,
+                glib::Priority::DEFAULT_IDLE,
                 crate::Cancellable::NONE,
                 move |ret| {
                     tx.send(ret).unwrap();
@@ -845,7 +845,7 @@ mod tests {
             let strm_clone = strm.clone();
             strm.writev_async(
                 [vec![1, 2, 3], vec![4, 5, 6]],
-                glib::PRIORITY_DEFAULT_IDLE,
+                glib::Priority::DEFAULT_IDLE,
                 crate::Cancellable::NONE,
                 move |ret| {
                     tx.send(ret).unwrap();
@@ -870,7 +870,7 @@ mod tests {
             let strm_clone = strm.clone();
             strm.writev_all_async(
                 [vec![1, 2, 3], vec![4, 5, 6]],
-                glib::PRIORITY_DEFAULT_IDLE,
+                glib::Priority::DEFAULT_IDLE,
                 crate::Cancellable::NONE,
                 move |ret| {
                     tx.send(ret).unwrap();
diff --git a/gio/src/pollable_input_stream.rs b/gio/src/pollable_input_stream.rs
@@ -205,7 +205,7 @@ impl<T: IsA<PollableInputStream>> AsyncRead for InputStreamAsyncRead<T> {
                     let source = stream.0.as_ref().create_source(
                         crate::Cancellable::NONE,
                         None,
-                        glib::PRIORITY_DEFAULT,
+                        glib::Priority::default(),
                         move |_| {
                             if let Some(waker) = waker.take() {
                                 waker.wake();
diff --git a/gio/src/pollable_output_stream.rs b/gio/src/pollable_output_stream.rs
@@ -213,7 +213,7 @@ impl<T: IsA<PollableOutputStream>> AsyncWrite for OutputStreamAsyncWrite<T> {
                     let source = stream.0.as_ref().create_source(
                         crate::Cancellable::NONE,
                         None,
-                        glib::PRIORITY_DEFAULT,
+                        glib::Priority::default(),
                         move |_| {
                             if let Some(waker) = waker.take() {
                                 waker.wake();
@@ -256,7 +256,7 @@ impl<T: IsA<PollableOutputStream>> AsyncWrite for OutputStreamAsyncWrite<T> {
                 let source = stream.0.as_ref().create_source(
                     crate::Cancellable::NONE,
                     None,
-                    glib::PRIORITY_DEFAULT,
+                    glib::Priority::default(),
                     move |_| {
                         if let Some(waker) = waker.take() {
                             waker.wake();
@@ -285,7 +285,7 @@ impl<T: IsA<PollableOutputStream>> AsyncWrite for OutputStreamAsyncWrite<T> {
         } else {
             let (tx, rx) = oneshot::channel();
             stream.0.as_ref().flush_async(
-                glib::PRIORITY_DEFAULT,
+                glib::Priority::default(),
                 crate::Cancellable::NONE,
                 move |res| {
                     let _ = tx.send(res);
@@ -317,7 +317,7 @@ impl<T: IsA<PollableOutputStream>> AsyncWrite for OutputStreamAsyncWrite<T> {
         } else {
             let (tx, rx) = oneshot::channel();
             stream.0.as_ref().close_async(
-                glib::PRIORITY_DEFAULT,
+                glib::Priority::default(),
                 crate::Cancellable::NONE,
                 move |res| {
                     let _ = tx.send(res);
diff --git a/gio/src/subclass/async_initable.rs b/gio/src/subclass/async_initable.rs
@@ -227,7 +227,7 @@ mod tests {
     #[allow(clippy::new_without_default)]
     impl AsyncInitableTestType {
         pub async fn new() -> Self {
-            AsyncInitable::new_future(glib::PRIORITY_DEFAULT)
+            AsyncInitable::new_future(glib::Priority::default())
                 .await
                 .expect("Failed creation/initialization of AsyncInitableTestType object")
         }
@@ -254,7 +254,9 @@ mod tests {
 
                 assert_ne!(0x123456789abcdef, test.value());
 
-                test.init_future(glib::PRIORITY_DEFAULT).await.map(|_| test)
+                test.init_future(glib::Priority::default())
+                    .await
+                    .map(|_| test)
             };
             assert!(res.is_ok());
             let test = res.unwrap();
@@ -278,7 +280,7 @@ mod tests {
             let value: u32 = 2;
             let _ = AsyncInitable::builder::<AsyncInitableTestType>()
                 .property("invalid-property", value)
-                .build_future(glib::PRIORITY_DEFAULT)
+                .build_future(glib::Priority::default())
                 .await;
             unreachable!();
         });
@@ -289,7 +291,7 @@ mod tests {
         glib::MainContext::new().block_on(async {
             let test = AsyncInitable::with_type_future(
                 AsyncInitableTestType::static_type(),
-                glib::PRIORITY_DEFAULT,
+                glib::Priority::default(),
             )
             .await
             .expect("Failed creation/initialization of AsyncInitableTestType object from type")
@@ -304,7 +306,7 @@ mod tests {
         glib::MainContext::new().block_on(async {
             let test = AsyncInitable::with_type_future(
                 AsyncInitableTestType::static_type(),
-                glib::PRIORITY_DEFAULT,
+                glib::Priority::default(),
             )
             .await
             .expect("Failed creation/initialization of AsyncInitableTestType object from values")
diff --git a/glib/src/future_with_timeout.rs b/glib/src/future_with_timeout.rs
@@ -46,7 +46,7 @@ pub async fn future_with_timeout<T>(
     timeout: std::time::Duration,
     fut: impl Future<Output = T>,
 ) -> Result<T, FutureWithTimeoutError> {
-    future_with_timeout_with_priority(crate::PRIORITY_DEFAULT, timeout, fut).await
+    future_with_timeout_with_priority(crate::Priority::default(), timeout, fut).await
 }
 
 #[cfg(test)]
diff --git a/glib/src/main_context.rs b/glib/src/main_context.rs
@@ -43,7 +43,7 @@ impl MainContext {
     where
         F: FnOnce() + Send + 'static,
     {
-        self.invoke_with_priority(crate::PRIORITY_DEFAULT_IDLE, func);
+        self.invoke_with_priority(crate::Priority::DEFAULT_IDLE, func);
     }
 
     // rustdoc-stripper-ignore-next
@@ -80,7 +80,7 @@ impl MainContext {
     where
         F: FnOnce() + 'static,
     {
-        self.invoke_local_with_priority(crate::PRIORITY_DEFAULT_IDLE, func);
+        self.invoke_local_with_priority(crate::Priority::DEFAULT_IDLE, func);
     }
 
     // rustdoc-stripper-ignore-next
diff --git a/glib/src/main_context_futures.rs b/glib/src/main_context_futures.rs
@@ -511,7 +511,7 @@ impl MainContext {
         &self,
         f: F,
     ) -> JoinHandle<R> {
-        self.spawn_with_priority(crate::PRIORITY_DEFAULT, f)
+        self.spawn_with_priority(crate::Priority::default(), f)
     }
 
     // rustdoc-stripper-ignore-next
@@ -523,7 +523,7 @@ impl MainContext {
     /// from any other `Future` that is executed on this main context, or after calling
     /// `with_thread_default` or `acquire` on the main context.
     pub fn spawn_local<R: 'static, F: Future<Output = R> + 'static>(&self, f: F) -> JoinHandle<R> {
-        self.spawn_local_with_priority(crate::PRIORITY_DEFAULT, f)
+        self.spawn_local_with_priority(crate::Priority::default(), f)
     }
 
     // rustdoc-stripper-ignore-next
@@ -582,7 +582,7 @@ impl MainContext {
         &self,
         func: impl FnOnce() -> F + Send + 'static,
     ) -> SpawnWithinJoinHandle<R> {
-        self.spawn_from_within_with_priority(crate::PRIORITY_DEFAULT, func)
+        self.spawn_from_within_with_priority(crate::Priority::default(), func)
     }
 
     // rustdoc-stripper-ignore-next
@@ -638,7 +638,7 @@ impl MainContext {
         };
 
         let source = TaskSource::new(
-            crate::PRIORITY_DEFAULT,
+            crate::Priority::default(),
             FutureWrapper::NonSend(ThreadGuard::new(f)),
             None,
         );
@@ -657,7 +657,7 @@ impl Spawn for MainContext {
     fn spawn_obj(&self, f: FutureObj<'static, ()>) -> Result<(), SpawnError> {
         let (tx, _) = oneshot::channel();
         let source = TaskSource::new(
-            crate::PRIORITY_DEFAULT,
+            crate::Priority::default(),
             FutureWrapper::Send(FutureObj::new(Box::new(async move {
                 f.await;
                 Box::new(()) as Box<dyn Any + Send + 'static>
@@ -673,7 +673,7 @@ impl LocalSpawn for MainContext {
     fn spawn_local_obj(&self, f: LocalFutureObj<'static, ()>) -> Result<(), SpawnError> {
         let (tx, _) = oneshot::channel();
         let source = TaskSource::new(
-            crate::PRIORITY_DEFAULT,
+            crate::Priority::default(),
             FutureWrapper::NonSend(ThreadGuard::new(LocalFutureObj::new(Box::new(
                 async move {
                     f.await;
diff --git a/glib/src/source.rs b/glib/src/source.rs
diff --git a/glib/src/source_futures.rs b/glib/src/source_futures.rs
