summaryrefslogtreecommitdiff
path: root/x11/i3bar-river/files/patch-rust-1.76
blob: 79eb4aa8dccb26134086053f3e67b213fe431384 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
Revert https://github.com/MaxVerevkin/i3bar-river/commit/d1ba22747e9e
until lang/rust >= 1.77 update.

error[E0658]: `c".."` literals are experimental
  --> src/bar.rs:61:13
   |
61 |             c"i3bar-river".into(),
   |             ^^^^^^^^^^^^^^
   |
   = note: see issue #105723 <https://github.com/rust-lang/rust/issues/105723> for more information

error[E0658]: `c".."` literals are experimental
   --> src/wm_info_provider/river.rs:118:33
    |
118 |             PointerBtn::Left => c"set-focused-tags",
    |                                 ^^^^^^^^^^^^^^^^^^^
    |
    = note: see issue #105723 <https://github.com/rust-lang/rust/issues/105723> for more information

error[E0658]: `c".."` literals are experimental
   --> src/wm_info_provider/river.rs:119:34
    |
119 |             PointerBtn::Right => c"toggle-focused-tags",
    |                                  ^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: see issue #105723 <https://github.com/rust-lang/rust/issues/105723> for more information

--- src/bar.rs.orig	2024-03-30 19:50:32 UTC
+++ src/bar.rs
@@ -58,7 +58,7 @@ impl Bar {
             surface,
             Some(output.wl),
             zwlr_layer_shell_v1::Layer::Top,
-            c"i3bar-river".into(),
+            wayrs_client::cstr!("i3bar-river").into(),
             layer_surface_cb,
         );
 
--- src/wm_info_provider/river.rs.orig	2024-03-30 19:50:32 UTC
+++ src/wm_info_provider/river.rs
@@ -2,7 +2,7 @@ use wayrs_client::proxy::Proxy;
 
 use wayrs_client::global::*;
 use wayrs_client::proxy::Proxy;
-use wayrs_client::EventCtx;
+use wayrs_client::{cstr, EventCtx};
 
 use super::*;
 
@@ -115,8 +115,8 @@ impl WmInfoProvider for RiverInfoProvider {
         btn: PointerBtn,
     ) {
         let cmd = match btn {
-            PointerBtn::Left => c"set-focused-tags",
-            PointerBtn::Right => c"toggle-focused-tags",
+            PointerBtn::Left => cstr!("set-focused-tags"),
+            PointerBtn::Right => cstr!("toggle-focused-tags"),
             _ => return,
         };
         self.control.add_argument(conn, cmd.to_owned());