Skip to content

Commit af2fc38

Browse files
sdroegesdroege
authored
Merge pull request #1024 from gtk-rs/bilelmoussaoui/priority
glib: Switch Priority to associated constants
2 parents 1f7cdc2 + f32fd06 commit af2fc38

File tree

15 files changed

+79
-61
lines changed

15 files changed

+79
-61
lines changed

‎examples/gio_futures/main.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fn main() {
3434
fn read_and_print_file(
3535
file: &gio::File,
3636
) -> impl Future<Output = Result<(), String>> + std::marker::Unpin {
37-
file.read_future(glib::PRIORITY_DEFAULT)
37+
file.read_future(glib::Priority::default())
3838
.map_err(|err| format!("Failed to open file: {err}"))
3939
.and_then(read_and_print_chunks)
4040
}
@@ -96,7 +96,7 @@ fn read_and_print_next_chunk(
9696
idx: usize,
9797
) -> impl Future<Output = Result<Option<Vec<u8>>, String>> + std::marker::Unpin {
9898
let strm_clone = strm.clone();
99-
strm.read_future(buf, glib::PRIORITY_DEFAULT)
99+
strm.read_future(buf, glib::Priority::default())
100100
.map_err(|(_buf, err)| format!("Failed to read from stream: {err}"))
101101
.and_then(move |(buf, len)| {
102102
println!("line {idx}: {:?}", str::from_utf8(&buf[0..len]).unwrap());
@@ -109,7 +109,7 @@ fn read_and_print_next_chunk(
109109
if len == 0 {
110110
futures::future::Either::Left(
111111
strm_clone
112-
.close_future(glib::PRIORITY_DEFAULT)
112+
.close_future(glib::Priority::default())
113113
.map_err(|err| format!("Failed to close stream: {err}"))
114114
.map_ok(|_| None),
115115
)

‎examples/gio_futures_await/main.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fn main() {
2828
async fn read_file(file: gio::File) -> Result<(), String> {
2929
// Try to open the file.
3030
let strm = file
31-
.read_future(glib::PRIORITY_DEFAULT)
31+
.read_future(glib::Priority::default())
3232
.map_err(|err| format!("Failed to open file: {err}"))
3333
.await?;
3434

@@ -40,7 +40,7 @@ async fn read_file(file: gio::File) -> Result<(), String> {
4040

4141
loop {
4242
let (b, len) = strm
43-
.read_future(buf, glib::PRIORITY_DEFAULT)
43+
.read_future(buf, glib::Priority::default())
4444
.map_err(|(_buf, err)| format!("Failed to read from stream: {err}"))
4545
.await?;
4646

@@ -58,7 +58,7 @@ async fn read_file(file: gio::File) -> Result<(), String> {
5858
}
5959

6060
// Asynchronously close the stream in the end.
61-
strm.close_future(glib::PRIORITY_DEFAULT)
61+
strm.close_future(glib::Priority::default())
6262
.map_err(|err| format!("Failed to close stream: {err}"))
6363
.await?;
6464

‎examples/gio_task/file_size/ffi.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ pub unsafe extern "C" fn my_file_size_get_file_size_async(
3333

3434
glib::MainContext::ref_thread_default().spawn_local(async move {
3535
let size = gio::File::for_path("Cargo.toml")
36-
.query_info_future("*", gio::FileQueryInfoFlags::NONE, glib::PRIORITY_DEFAULT)
36+
.query_info_future(
37+
"*",
38+
gio::FileQueryInfoFlags::NONE,
39+
glib::Priority::default(),
40+
)
3741
.await
3842
.unwrap()
3943
.size();

‎examples/gio_task/file_size/mod.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ impl FileSize {
4141

4242
glib::MainContext::ref_thread_default().spawn_local(async move {
4343
let size = gio::File::for_path("Cargo.toml")
44-
.query_info_future("*", gio::FileQueryInfoFlags::NONE, glib::PRIORITY_DEFAULT)
44+
.query_info_future(
45+
"*",
46+
gio::FileQueryInfoFlags::NONE,
47+
glib::Priority::default(),
48+
)
4549
.await
4650
.unwrap()
4751
.size();

‎gio/src/input_stream.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ mod tests {
598598
let buf = vec![0; 10];
599599
strm.read_all_async(
600600
buf,
601-
glib::PRIORITY_DEFAULT_IDLE,
601+
glib::Priority::DEFAULT_IDLE,
602602
crate::Cancellable::NONE,
603603
move |ret| {
604604
tx.send(ret).unwrap();
@@ -653,7 +653,7 @@ mod tests {
653653
let buf = vec![0; 10];
654654
strm.read_async(
655655
buf,
656-
glib::PRIORITY_DEFAULT_IDLE,
656+
glib::Priority::DEFAULT_IDLE,
657657
crate::Cancellable::NONE,
658658
move |ret| {
659659
tx.send(ret).unwrap();
@@ -677,7 +677,7 @@ mod tests {
677677

678678
strm.read_bytes_async(
679679
10,
680-
glib::PRIORITY_DEFAULT_IDLE,
680+
glib::Priority::DEFAULT_IDLE,
681681
crate::Cancellable::NONE,
682682
move |ret| {
683683
tx.send(ret).unwrap();
@@ -698,7 +698,7 @@ mod tests {
698698

699699
strm.skip_async(
700700
10,
701-
glib::PRIORITY_DEFAULT_IDLE,
701+
glib::Priority::DEFAULT_IDLE,
702702
crate::Cancellable::NONE,
703703
move |ret| {
704704
tx.send(ret).unwrap();

‎gio/src/memory_input_stream.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ mod tests {
6464

6565
let res = c
6666
.block_on(
67-
strm.read_future(buf, glib::PRIORITY_DEFAULT)
67+
strm.read_future(buf, glib::Priority::default())
6868
.map_err(|(_buf, err)| err)
6969
.map_ok(move |(mut buf, len)| {
7070
buf.truncate(len);

‎gio/src/output_stream.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ mod tests {
723723
strm.splice_async(
724724
&input,
725725
crate::OutputStreamSpliceFlags::CLOSE_SOURCE,
726-
glib::PRIORITY_DEFAULT_IDLE,
726+
glib::Priority::DEFAULT_IDLE,
727727
crate::Cancellable::NONE,
728728
move |ret| {
729729
tx.send(ret).unwrap();
@@ -743,7 +743,7 @@ mod tests {
743743
let buf = vec![1, 2, 3];
744744
strm.write_async(
745745
buf,
746-
glib::PRIORITY_DEFAULT_IDLE,
746+
glib::Priority::DEFAULT_IDLE,
747747
crate::Cancellable::NONE,
748748
move |ret| {
749749
tx.send(ret).unwrap();
@@ -765,7 +765,7 @@ mod tests {
765765
let buf = vec![1, 2, 3];
766766
strm.write_all_async(
767767
buf,
768-
glib::PRIORITY_DEFAULT_IDLE,
768+
glib::Priority::DEFAULT_IDLE,
769769
crate::Cancellable::NONE,
770770
move |ret| {
771771
tx.send(ret).unwrap();
@@ -788,7 +788,7 @@ mod tests {
788788
let b = Bytes::from_owned(vec![1, 2, 3]);
789789
strm.write_bytes_async(
790790
&b,
791-
glib::PRIORITY_DEFAULT_IDLE,
791+
glib::Priority::DEFAULT_IDLE,
792792
crate::Cancellable::NONE,
793793
move |ret| {
794794
tx.send(ret).unwrap();
@@ -845,7 +845,7 @@ mod tests {
845845
let strm_clone = strm.clone();
846846
strm.writev_async(
847847
[vec![1, 2, 3], vec![4, 5, 6]],
848-
glib::PRIORITY_DEFAULT_IDLE,
848+
glib::Priority::DEFAULT_IDLE,
849849
crate::Cancellable::NONE,
850850
move |ret| {
851851
tx.send(ret).unwrap();
@@ -870,7 +870,7 @@ mod tests {
870870
let strm_clone = strm.clone();
871871
strm.writev_all_async(
872872
[vec![1, 2, 3], vec![4, 5, 6]],
873-
glib::PRIORITY_DEFAULT_IDLE,
873+
glib::Priority::DEFAULT_IDLE,
874874
crate::Cancellable::NONE,
875875
move |ret| {
876876
tx.send(ret).unwrap();

‎gio/src/pollable_input_stream.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ impl<T: IsA<PollableInputStream>> AsyncRead for InputStreamAsyncRead<T> {
205205
let source = stream.0.as_ref().create_source(
206206
crate::Cancellable::NONE,
207207
None,
208-
glib::PRIORITY_DEFAULT,
208+
glib::Priority::default(),
209209
move |_| {
210210
if let Some(waker) = waker.take() {
211211
waker.wake();

‎gio/src/pollable_output_stream.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ impl<T: IsA<PollableOutputStream>> AsyncWrite for OutputStreamAsyncWrite<T> {
213213
let source = stream.0.as_ref().create_source(
214214
crate::Cancellable::NONE,
215215
None,
216-
glib::PRIORITY_DEFAULT,
216+
glib::Priority::default(),
217217
move |_| {
218218
if let Some(waker) = waker.take() {
219219
waker.wake();
@@ -256,7 +256,7 @@ impl<T: IsA<PollableOutputStream>> AsyncWrite for OutputStreamAsyncWrite<T> {
256256
let source = stream.0.as_ref().create_source(
257257
crate::Cancellable::NONE,
258258
None,
259-
glib::PRIORITY_DEFAULT,
259+
glib::Priority::default(),
260260
move |_| {
261261
if let Some(waker) = waker.take() {
262262
waker.wake();
@@ -285,7 +285,7 @@ impl<T: IsA<PollableOutputStream>> AsyncWrite for OutputStreamAsyncWrite<T> {
285285
} else {
286286
let (tx, rx) = oneshot::channel();
287287
stream.0.as_ref().flush_async(
288-
glib::PRIORITY_DEFAULT,
288+
glib::Priority::default(),
289289
crate::Cancellable::NONE,
290290
move |res| {
291291
let _ = tx.send(res);
@@ -317,7 +317,7 @@ impl<T: IsA<PollableOutputStream>> AsyncWrite for OutputStreamAsyncWrite<T> {
317317
} else {
318318
let (tx, rx) = oneshot::channel();
319319
stream.0.as_ref().close_async(
320-
glib::PRIORITY_DEFAULT,
320+
glib::Priority::default(),
321321
crate::Cancellable::NONE,
322322
move |res| {
323323
let _ = tx.send(res);

‎gio/src/subclass/async_initable.rs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ mod tests {
227227
#[allow(clippy::new_without_default)]
228228
impl AsyncInitableTestType {
229229
pub async fn new() -> Self {
230-
AsyncInitable::new_future(glib::PRIORITY_DEFAULT)
230+
AsyncInitable::new_future(glib::Priority::default())
231231
.await
232232
.expect("Failed creation/initialization of AsyncInitableTestType object")
233233
}
@@ -254,7 +254,9 @@ mod tests {
254254

255255
assert_ne!(0x123456789abcdef, test.value());
256256

257-
test.init_future(glib::PRIORITY_DEFAULT).await.map(|_| test)
257+
test.init_future(glib::Priority::default())
258+
.await
259+
.map(|_| test)
258260
};
259261
assert!(res.is_ok());
260262
let test = res.unwrap();
@@ -278,7 +280,7 @@ mod tests {
278280
let value: u32 = 2;
279281
let _ = AsyncInitable::builder::<AsyncInitableTestType>()
280282
.property("invalid-property", value)
281-
.build_future(glib::PRIORITY_DEFAULT)
283+
.build_future(glib::Priority::default())
282284
.await;
283285
unreachable!();
284286
});
@@ -289,7 +291,7 @@ mod tests {
289291
glib::MainContext::new().block_on(async {
290292
let test = AsyncInitable::with_type_future(
291293
AsyncInitableTestType::static_type(),
292-
glib::PRIORITY_DEFAULT,
294+
glib::Priority::default(),
293295
)
294296
.await
295297
.expect("Failed creation/initialization of AsyncInitableTestType object from type")
@@ -304,7 +306,7 @@ mod tests {
304306
glib::MainContext::new().block_on(async {
305307
let test = AsyncInitable::with_type_future(
306308
AsyncInitableTestType::static_type(),
307-
glib::PRIORITY_DEFAULT,
309+
glib::Priority::default(),
308310
)
309311
.await
310312
.expect("Failed creation/initialization of AsyncInitableTestType object from values")

0 commit comments

Comments
 (0)