Skip to content

Commit

Permalink
Fix clippy warnings
Browse files Browse the repository at this point in the history
Mostly unnecessary 'as' casts to same kind, and unneeded borrows
  • Loading branch information
dbr committed Mar 22, 2023
1 parent 3e995f4 commit b7fbd57
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion imgui-winit-glow-renderer-viewports/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ impl Renderer {
winit::event::WindowEvent::Moved(_) => unsafe {
let new_pos = window.inner_position().unwrap().cast::<f32>();
(*(viewport.platform_user_data.cast::<ViewportData>())).pos =
[new_pos.x as f32, new_pos.y as f32];
[new_pos.x, new_pos.y];

viewport.platform_request_move = true;
},
Expand Down
2 changes: 1 addition & 1 deletion imgui/src/input_widget.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@ extern "C" fn callback<T: InputTextCallbackHandler>(
}
InputTextFlags::CALLBACK_HISTORY => {
let key = unsafe {
let key = (*data).EventKey as u32;
let key = (*data).EventKey;
match key {
sys::ImGuiKey_UpArrow => HistoryDirection::Up,
sys::ImGuiKey_DownArrow => HistoryDirection::Down,
Expand Down
2 changes: 1 addition & 1 deletion imgui/src/stacks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ impl IdStackToken<'_> {
}

/// # ID stack
impl<'ui> Ui {
impl Ui {
/// Pushes an identifier to the ID stack.
///
/// Returns an `IdStackToken` that can be popped by calling `.end()`
Expand Down
2 changes: 1 addition & 1 deletion imgui/src/string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ impl ImString {
}
}

impl<'a> Default for ImString {
impl Default for ImString {
#[inline]
fn default() -> ImString {
ImString(vec![b'\0'])
Expand Down
4 changes: 2 additions & 2 deletions imgui/src/tables.rs
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ impl Ui {
pub fn table_set_column_index(&self, column_index: usize) -> bool {
#[cfg(debug_assertions)]
{
let size = self.table_column_count() as usize;
let size = self.table_column_count();
if column_index >= size {
panic!(
"column_index >= self.table_get_column_count().\
Expand Down Expand Up @@ -760,7 +760,7 @@ pub struct TableColumnSetup<Name> {
pub user_id: Id,
}

impl<'a, Name: AsRef<str>> TableColumnSetup<Name> {
impl<Name: AsRef<str>> TableColumnSetup<Name> {
pub fn new(name: Name) -> Self {
Self {
name,
Expand Down
2 changes: 1 addition & 1 deletion imgui/src/window/scroll.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::sys;
use crate::Ui;

/// # Window scrolling
impl<'ui> Ui {
impl Ui {
/// Returns the horizontal scrolling position.
///
/// Value is between 0.0 and self.scroll_max_x().
Expand Down
14 changes: 7 additions & 7 deletions xtask/src/bindgen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,22 +131,22 @@ fn generate_binding_file(
"--use-core",
];
cmd.args(a);
cmd.args(&["--blocklist-type", "__darwin_size_t"]);
cmd.args(&["--raw-line", "#![allow(nonstandard_style, clippy::all)]"]);
cmd.args(["--blocklist-type", "__darwin_size_t"]);
cmd.args(["--raw-line", "#![allow(nonstandard_style, clippy::all)]"]);
cmd.arg("--output").arg(output);
cmd.args(&["--ctypes-prefix", "cty"]);
cmd.args(["--ctypes-prefix", "cty"]);

if let Some(name) = wasm_import_mod {
cmd.args(&["--wasm-import-module-name", name]);
cmd.args(["--wasm-import-module-name", name]);
}
for t in types {
cmd.args(&["--allowlist-type", t]);
cmd.args(["--allowlist-type", t]);
}
for f in funcs {
cmd.args(&["--allowlist-function", f]);
cmd.args(["--allowlist-function", f]);
}
cmd.arg(header);
cmd.args(&["--", "-DCIMGUI_DEFINE_ENUMS_AND_STRUCTS=1"]);
cmd.args(["--", "-DCIMGUI_DEFINE_ENUMS_AND_STRUCTS=1"]);
eprintln!("Executing bindgen [output = {}]", output.display());
let status = cmd.status().context("Failed to execute bindgen")?;
if !status.success() {
Expand Down
2 changes: 1 addition & 1 deletion xtask/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fn main() {

fn try_main() -> Result<()> {
let root = project_root();
let _d = xshell::pushd(&root)?;
let _d = xshell::pushd(root)?;
let flags = flags::Xtask::from_env()?;
if flags.verbose {
VERBOSE.store(true, std::sync::atomic::Ordering::Relaxed);
Expand Down

0 comments on commit b7fbd57

Please sign in to comment.