Skip to content

Commit 8623b9e

Browse files
rtbortbo
authored
Merge pull request #275 from rtbo/rm_warnings
remove compilation warnings
2 parents 8a61bb1 + ae8d97c commit 8623b9e

File tree

6 files changed

+48
-68
lines changed

6 files changed

+48
-68
lines changed

‎build/cg/doc.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,21 @@ impl DocField {
1717
}
1818
}
1919

20+
#[allow(dead_code)]
2021
#[derive(Debug, Clone)]
2122
pub struct DocError {
2223
pub typ: String,
2324
pub text: String,
2425
}
2526

27+
#[allow(dead_code)]
2628
#[derive(Debug, Clone)]
2729
pub struct DocSee {
2830
pub typ: String,
2931
pub name: String,
3032
}
3133

34+
#[allow(dead_code)]
3235
#[derive(Debug, Clone)]
3336
pub struct Doc {
3437
pub brief: Option<String>,

‎build/cg/mod.rs‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -158,16 +158,13 @@ enum Field {
158158
Expr {
159159
name: String,
160160
typ: String,
161-
wire_off: Expr,
162161
wire_sz: Expr,
163162
expr: Expr,
164163
},
165164
Pad {
166-
wire_off: Expr,
167165
wire_sz: Expr,
168166
},
169167
AlignPad {
170-
wire_off: Expr,
171168
wire_sz: Expr,
172169
},
173170
}
@@ -560,7 +557,7 @@ impl CodeGen {
560557
writeln!(out, " unsafe {{")?;
561558
writeln!(
562559
out,
563-
" xcb_prefetch_extension_data(conn.get_raw_conn(), &mut FFI_EXT as *mut _);"
560+
" xcb_prefetch_extension_data(conn.get_raw_conn(), std::ptr::addr_of_mut!(FFI_EXT));"
564561
)?;
565562
writeln!(out, " }}")?;
566563
writeln!(out, "}}")?;
@@ -588,7 +585,7 @@ impl CodeGen {
588585
writeln!(out, " unsafe {{")?;
589586
writeln!(
590587
out,
591-
" let reply = xcb_get_extension_data(conn.get_raw_conn(), &mut FFI_EXT as *mut _);"
588+
" let reply = xcb_get_extension_data(conn.get_raw_conn(), std::ptr::addr_of_mut!(FFI_EXT));"
592589
)?;
593590
writeln!(
594591
out,
@@ -1124,10 +1121,6 @@ trait WireSz {
11241121
fn wire_sz(&self) -> Expr;
11251122
}
11261123

1127-
trait WireOff {
1128-
fn wire_off(&self) -> Expr;
1129-
}
1130-
11311124
trait HasWireLayout {
11321125
fn has_wire_layout(&self) -> bool;
11331126
}
@@ -1216,19 +1209,6 @@ impl WireSz for TypeInfo {
12161209
}
12171210
}
12181211

1219-
impl WireOff for Field {
1220-
fn wire_off(&self) -> Expr {
1221-
match self {
1222-
Field::Field { wire_off, .. }
1223-
| Field::List { wire_off, .. }
1224-
| Field::Switch { wire_off, .. }
1225-
| Field::Expr { wire_off, .. }
1226-
| Field::Pad { wire_off, .. }
1227-
| Field::AlignPad { wire_off, .. } => wire_off.clone(),
1228-
}
1229-
}
1230-
}
1231-
12321212
impl HasWireLayout for TypeInfo {
12331213
fn has_wire_layout(&self) -> bool {
12341214
match self {

‎build/cg/request.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ impl CodeGen {
809809
if self.xcb_mod == "xproto" {
810810
writeln!(out, "{}ext: std::ptr::null_mut(),", cg::ind(3))?;
811811
} else {
812-
writeln!(out, "{}ext: (&mut FFI_EXT) as *mut _,", cg::ind(3))?;
812+
writeln!(out, "{}ext: std::ptr::addr_of_mut!(FFI_EXT),", cg::ind(3))?;
813813
}
814814
writeln!(out, "{}opcode: {},", cg::ind(3), opcode)?;
815815
writeln!(

‎build/cg/struct.rs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,19 +182,16 @@ impl CodeGen {
182182
}
183183
ir::Field::Pad(wire_sz) => {
184184
has_wire_layout = false;
185-
let wire_off = wire_off.clone().reduce();
186185
vec.push(Field::Pad {
187-
wire_off,
188186
wire_sz: Expr::Value(*wire_sz),
189187
});
190188
Expr::Value(*wire_sz)
191189
}
192190
ir::Field::AlignPad(sz) => {
193191
has_wire_layout = false;
194192
let wire_off = wire_off.clone().reduce();
195-
let wire_sz = Expr::AlignPad(*sz, Box::new(wire_off.clone())).reduce();
193+
let wire_sz = Expr::AlignPad(*sz, Box::new(wire_off)).reduce();
196194
vec.push(Field::AlignPad {
197-
wire_off,
198195
wire_sz: wire_sz.clone(),
199196
});
200197
wire_sz
@@ -357,7 +354,6 @@ impl CodeGen {
357354
vec.push(Field::Expr {
358355
name,
359356
typ,
360-
wire_off: wire_off.clone(),
361357
wire_sz: wire_sz.clone(),
362358
expr,
363359
});

‎src/base.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,9 +1324,9 @@ impl Connection {
13241324
unsafe {
13251325
let ext: *mut xcb_extension_t = match XGE::EXTENSION {
13261326
#[cfg(feature = "xinput")]
1327-
Extension::Input => &mut xinput::FFI_EXT as *mut _,
1327+
Extension::Input => ptr::addr_of_mut!(xinput::FFI_EXT),
13281328
#[cfg(feature = "present")]
1329-
Extension::Present => &mut present::FFI_EXT as *mut _,
1329+
Extension::Present => ptr::addr_of_mut!(present::FFI_EXT),
13301330
_ => unreachable!("only Input and Present have XGE events"),
13311331
};
13321332

@@ -1385,10 +1385,10 @@ impl Connection {
13851385
unsafe {
13861386
let ext: *mut xcb_extension_t = match extension {
13871387
#[cfg(feature = "xinput")]
1388-
Extension::Input => &mut xinput::FFI_EXT as *mut _,
1388+
Extension::Input => ptr::addr_of_mut!(xinput::FFI_EXT),
13891389
#[cfg(feature = "present")]
1390-
Extension::Present => &mut present::FFI_EXT as *mut _,
1391-
_ => panic!("only Input and Present have XGE events"),
1390+
Extension::Present => ptr::addr_of_mut!(present::FFI_EXT),
1391+
_ => unreachable!("only Input and Present have XGE events"),
13921392
};
13931393

13941394
let raw = xcb_register_for_special_xge(self.c, ext, eid.resource_id(), ptr::null_mut());

‎src/ext.rs‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use crate::x;
66

77
use std::fmt;
88
use std::mem;
9+
use std::ptr;
910

1011
/// Refers to a X protocol extension.
1112
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
@@ -283,18 +284,18 @@ pub fn cache_extensions_data(
283284
unsafe {
284285
for ext in mandatory {
285286
let ext_id = get_extension_id(*ext);
286-
xcb_prefetch_extension_data(conn, ext_id as *mut _);
287+
xcb_prefetch_extension_data(conn, ext_id);
287288
}
288289
for ext in optional {
289290
let ext_id = get_extension_id(*ext);
290-
xcb_prefetch_extension_data(conn, ext_id as *mut _);
291+
xcb_prefetch_extension_data(conn, ext_id);
291292
}
292293

293294
let mut ext_data = Vec::new();
294295

295296
for ext in mandatory {
296297
let ext_id = get_extension_id(*ext);
297-
let raw = xcb_get_extension_data(conn, ext_id as *mut _);
298+
let raw = xcb_get_extension_data(conn, ext_id);
298299
let reply = x::QueryExtensionReply::from_raw(raw);
299300

300301
assert!(
@@ -313,7 +314,7 @@ pub fn cache_extensions_data(
313314

314315
for ext in optional {
315316
let ext_id = get_extension_id(*ext);
316-
let raw = xcb_get_extension_data(conn, ext_id as *mut _);
317+
let raw = xcb_get_extension_data(conn, ext_id);
317318
let reply = x::QueryExtensionReply::from_raw(raw);
318319

319320
if !reply.present() {
@@ -337,93 +338,93 @@ pub fn cache_extensions_data(
337338
}
338339
}
339340

340-
unsafe fn get_extension_id(ext: Extension) -> &'static mut xcb_extension_t {
341+
unsafe fn get_extension_id(ext: Extension) -> *mut xcb_extension_t {
341342
match ext {
342-
Extension::BigRequests => &mut crate::bigreq::FFI_EXT,
343-
Extension::XcMisc => &mut crate::xc_misc::FFI_EXT,
343+
Extension::BigRequests => ptr::addr_of_mut!(crate::bigreq::FFI_EXT),
344+
Extension::XcMisc => ptr::addr_of_mut!(crate::xc_misc::FFI_EXT),
344345

345346
#[cfg(feature = "composite")]
346-
Extension::Composite => &mut crate::composite::FFI_EXT,
347+
Extension::Composite => ptr::addr_of_mut!(crate::composite::FFI_EXT),
347348

348349
#[cfg(feature = "damage")]
349-
Extension::Damage => &mut crate::damage::FFI_EXT,
350+
Extension::Damage => ptr::addr_of_mut!(crate::damage::FFI_EXT),
350351

351352
#[cfg(feature = "dpms")]
352-
Extension::Dpms => &mut crate::dpms::FFI_EXT,
353+
Extension::Dpms => ptr::addr_of_mut!(crate::dpms::FFI_EXT),
353354

354355
#[cfg(feature = "dri2")]
355-
Extension::Dri2 => &mut crate::dri2::FFI_EXT,
356+
Extension::Dri2 => ptr::addr_of_mut!(crate::dri2::FFI_EXT),
356357

357358
#[cfg(feature = "dri3")]
358-
Extension::Dri3 => &mut crate::dri3::FFI_EXT,
359+
Extension::Dri3 => ptr::addr_of_mut!(crate::dri3::FFI_EXT),
359360

360361
#[cfg(feature = "ge")]
361-
Extension::GenericEvent => &mut crate::ge::FFI_EXT,
362+
Extension::GenericEvent => ptr::addr_of_mut!(crate::ge::FFI_EXT),
362363

363364
#[cfg(feature = "glx")]
364-
Extension::Glx => &mut crate::glx::FFI_EXT,
365+
Extension::Glx => ptr::addr_of_mut!(crate::glx::FFI_EXT),
365366

366367
#[cfg(feature = "present")]
367-
Extension::Present => &mut crate::present::FFI_EXT,
368+
Extension::Present => ptr::addr_of_mut!(crate::present::FFI_EXT),
368369

369370
#[cfg(feature = "randr")]
370-
Extension::RandR => &mut crate::randr::FFI_EXT,
371+
Extension::RandR => ptr::addr_of_mut!(crate::randr::FFI_EXT),
371372

372373
#[cfg(feature = "record")]
373-
Extension::Record => &mut crate::record::FFI_EXT,
374+
Extension::Record => ptr::addr_of_mut!(crate::record::FFI_EXT),
374375

375376
#[cfg(feature = "render")]
376-
Extension::Render => &mut crate::render::FFI_EXT,
377+
Extension::Render => ptr::addr_of_mut!(crate::render::FFI_EXT),
377378

378379
#[cfg(feature = "res")]
379-
Extension::Res => &mut crate::res::FFI_EXT,
380+
Extension::Res => ptr::addr_of_mut!(crate::res::FFI_EXT),
380381

381382
#[cfg(feature = "screensaver")]
382-
Extension::ScreenSaver => &mut crate::screensaver::FFI_EXT,
383+
Extension::ScreenSaver => ptr::addr_of_mut!(crate::screensaver::FFI_EXT),
383384

384385
#[cfg(feature = "shape")]
385-
Extension::Shape => &mut crate::shape::FFI_EXT,
386+
Extension::Shape => ptr::addr_of_mut!(crate::shape::FFI_EXT),
386387

387388
#[cfg(feature = "shm")]
388-
Extension::Shm => &mut crate::shm::FFI_EXT,
389+
Extension::Shm => ptr::addr_of_mut!(crate::shm::FFI_EXT),
389390

390391
#[cfg(feature = "sync")]
391-
Extension::Sync => &mut crate::sync::FFI_EXT,
392+
Extension::Sync => ptr::addr_of_mut!(crate::sync::FFI_EXT),
392393

393394
#[cfg(feature = "xevie")]
394-
Extension::Xevie => &mut crate::xevie::FFI_EXT,
395+
Extension::Xevie => ptr::addr_of_mut!(crate::xevie::FFI_EXT),
395396

396397
#[cfg(feature = "xf86dri")]
397-
Extension::Xf86Dri => &mut crate::xf86dri::FFI_EXT,
398+
Extension::Xf86Dri => ptr::addr_of_mut!(crate::xf86dri::FFI_EXT),
398399

399400
#[cfg(feature = "xf86vidmode")]
400-
Extension::Xf86VidMode => &mut crate::xf86vidmode::FFI_EXT,
401+
Extension::Xf86VidMode => ptr::addr_of_mut!(crate::xf86vidmode::FFI_EXT),
401402

402403
#[cfg(feature = "xfixes")]
403-
Extension::XFixes => &mut crate::xfixes::FFI_EXT,
404+
Extension::XFixes => ptr::addr_of_mut!(crate::xfixes::FFI_EXT),
404405

405406
#[cfg(feature = "xinerama")]
406-
Extension::Xinerama => &mut crate::xinerama::FFI_EXT,
407+
Extension::Xinerama => ptr::addr_of_mut!(crate::xinerama::FFI_EXT),
407408

408409
#[cfg(feature = "xinput")]
409-
Extension::Input => &mut crate::xinput::FFI_EXT,
410+
Extension::Input => ptr::addr_of_mut!(crate::xinput::FFI_EXT),
410411

411412
#[cfg(feature = "xkb")]
412-
Extension::Xkb => &mut crate::xkb::FFI_EXT,
413+
Extension::Xkb => ptr::addr_of_mut!(crate::xkb::FFI_EXT),
413414

414415
#[cfg(feature = "xprint")]
415-
Extension::XPrint => &mut crate::xprint::FFI_EXT,
416+
Extension::XPrint => ptr::addr_of_mut!(crate::xprint::FFI_EXT),
416417

417418
#[cfg(feature = "xselinux")]
418-
Extension::SeLinux => &mut crate::xselinux::FFI_EXT,
419+
Extension::SeLinux => ptr::addr_of_mut!(crate::xselinux::FFI_EXT),
419420

420421
#[cfg(feature = "xtest")]
421-
Extension::Test => &mut crate::xtest::FFI_EXT,
422+
Extension::Test => ptr::addr_of_mut!(crate::xtest::FFI_EXT),
422423

423424
#[cfg(feature = "xv")]
424-
Extension::Xv => &mut crate::xv::FFI_EXT,
425+
Extension::Xv => ptr::addr_of_mut!(crate::xv::FFI_EXT),
425426

426427
#[cfg(feature = "xvmc")]
427-
Extension::XvMc => &mut crate::xvmc::FFI_EXT,
428+
Extension::XvMc => ptr::addr_of_mut!(crate::xvmc::FFI_EXT),
428429
}
429430
}

0 commit comments

Comments
 (0)