Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix clippy::needless_borrow lint violations (#36444)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2025-08-18 23:54:35 +02:00 • committed by GitHub
parent eecf142f06
commit 9e0e233319
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
242 changed files with 801 additions and 821 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/gpui/build.rs
View file

@ -374,7 +374,7 @@ mod windows {
shader_path,
"vs_4_1",
);
generate_rust_binding(&const_name, &output_file, &rust_binding_path);
generate_rust_binding(&const_name, &output_file, rust_binding_path);
// Compile fragment shader
let output_file = format!("{}/{}_ps.h", out_dir, module);
@ -387,7 +387,7 @@ mod windows {
shader_path,
"ps_4_1",
);
generate_rust_binding(&const_name, &output_file, &rust_binding_path);
generate_rust_binding(&const_name, &output_file, rust_binding_path);
}
fn compile_shader_impl(

4
crates/gpui/examples/input.rs
View file

@ -137,14 +137,14 @@ impl TextInput {
fn copy(&mut self, _: &Copy, _: &mut Window, cx: &mut Context<Self>) {
if !self.selected_range.is_empty() {
cx.write_to_clipboard(ClipboardItem::new_string(
(&self.content[self.selected_range.clone()]).to_string(),
self.content[self.selected_range.clone()].to_string(),
));
}
}
fn cut(&mut self, _: &Cut, window: &mut Window, cx: &mut Context<Self>) {
if !self.selected_range.is_empty() {
cx.write_to_clipboard(ClipboardItem::new_string(
(&self.content[self.selected_range.clone()]).to_string(),
self.content[self.selected_range.clone()].to_string(),
));
self.replace_text_in_range(None, "", window, cx)
}

4
crates/gpui/src/app.rs
View file

@ -1310,7 +1310,7 @@ impl App {
T: 'static,
{
let window_handle = window.handle;
self.observe_release(&handle, move |entity, cx| {
self.observe_release(handle, move |entity, cx| {
let _ = window_handle.update(cx, |_, window, cx| on_release(entity, window, cx));
})
}
@ -1917,7 +1917,7 @@ impl AppContext for App {
G: Global,
{
let mut g = self.global::<G>();
callback(&g, self)
callback(g, self)
}
}

2
crates/gpui/src/app/entity_map.rs
View file

@ -661,7 +661,7 @@ pub struct WeakEntity<T> {
impl<T> std::fmt::Debug for WeakEntity<T> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct(&type_name::<Self>())
f.debug_struct(type_name::<Self>())
.field("entity_id", &self.any_entity.entity_id)
.field("entity_type", &type_name::<T>())
.finish()

2
crates/gpui/src/elements/div.rs
View file

@ -2785,7 +2785,7 @@ fn handle_tooltip_check_visible_and_update(
match action {
Action::None => {}
Action::Hide => clear_active_tooltip(&active_tooltip, window),
Action::Hide => clear_active_tooltip(active_tooltip, window),
Action::ScheduleHide(tooltip) => {
let delayed_hide_task = window.spawn(cx, {
let active_tooltip = active_tooltip.clone();

2
crates/gpui/src/inspector.rs
View file

@ -164,7 +164,7 @@ mod conditional {
if let Some(render_inspector) = cx
.inspector_element_registry
.renderers_by_type_id
.remove(&type_id)
.remove(type_id)
{
let mut element = (render_inspector)(
active_element.id.clone(),

4
crates/gpui/src/key_dispatch.rs
View file

@ -408,7 +408,7 @@ impl DispatchTree {
keymap
.bindings_for_action(action)
.filter(|binding| {
Self::binding_matches_predicate_and_not_shadowed(&keymap, &binding, context_stack)
Self::binding_matches_predicate_and_not_shadowed(&keymap, binding, context_stack)
})
.cloned()
.collect()
@ -426,7 +426,7 @@ impl DispatchTree {
.bindings_for_action(action)
.rev()
.find(|binding| {
Self::binding_matches_predicate_and_not_shadowed(&keymap, &binding, context_stack)
Self::binding_matches_predicate_and_not_shadowed(&keymap, binding, context_stack)
})
.cloned()
}

2
crates/gpui/src/keymap.rs
View file

@ -148,7 +148,7 @@ impl Keymap {
let mut pending_bindings = SmallVec::<[(BindingIndex, &KeyBinding); 1]>::new();
for (ix, binding) in self.bindings().enumerate().rev() {
let Some(depth) = self.binding_enabled(binding, &context_stack) else {
let Some(depth) = self.binding_enabled(binding, context_stack) else {
continue;
};
let Some(pending) = binding.match_keystrokes(input) else {

2
crates/gpui/src/path_builder.rs
View file

@ -278,7 +278,7 @@ impl PathBuilder {
options: &StrokeOptions,
) -> Result<Path<Pixels>, Error> {
let path = if let Some(dash_array) = dash_array {
let measurements = lyon::algorithms::measure::PathMeasurements::from_path(&path, 0.01);
let measurements = lyon::algorithms::measure::PathMeasurements::from_path(path, 0.01);
let mut sampler = measurements
.create_sampler(path, lyon::algorithms::measure::SampleType::Normalized);
let mut builder = lyon::path::Path::builder();

2
crates/gpui/src/platform.rs
View file

@ -1508,7 +1508,7 @@ impl ClipboardItem {
for entry in self.entries.iter() {
if let ClipboardEntry::String(ClipboardString { text, metadata: _ }) = entry {
answer.push_str(&text);
answer.push_str(text);
any_entries = true;
}
}

2
crates/gpui/src/platform/linux/platform.rs
View file

@ -642,7 +642,7 @@ pub(super) fn get_xkb_compose_state(cx: &xkb::Context) -> Option<xkb::compose::S
let mut state: Option<xkb::compose::State> = None;
for locale in locales {
if let Ok(table) =
xkb::compose::Table::new_from_locale(&cx, &locale, xkb::compose::COMPILE_NO_FLAGS)
xkb::compose::Table::new_from_locale(cx, &locale, xkb::compose::COMPILE_NO_FLAGS)
{
state = Some(xkb::compose::State::new(
&table,

15
crates/gpui/src/platform/linux/wayland/client.rs
View file

@ -1145,7 +1145,7 @@ impl Dispatch<wl_seat::WlSeat, ()> for WaylandClientStatePtr {
.globals
.text_input_manager
.as_ref()
.map(|text_input_manager| text_input_manager.get_text_input(&seat, qh, ()));
.map(|text_input_manager| text_input_manager.get_text_input(seat, qh, ()));
if let Some(wl_keyboard) = &state.wl_keyboard {
wl_keyboard.release();
@ -1294,7 +1294,7 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for WaylandClientStatePtr {
match key_state {
wl_keyboard::KeyState::Pressed if !keysym.is_modifier_key() => {
let mut keystroke =
Keystroke::from_xkb(&keymap_state, state.modifiers, keycode);
Keystroke::from_xkb(keymap_state, state.modifiers, keycode);
if let Some(mut compose) = state.compose_state.take() {
compose.feed(keysym);
match compose.status() {
@ -1538,12 +1538,9 @@ impl Dispatch<wl_pointer::WlPointer, ()> for WaylandClientStatePtr {
cursor_shape_device.set_shape(serial, style.to_shape());
} else {
let scale = window.primary_output_scale();
state.cursor.set_icon(
&wl_pointer,
serial,
style.to_icon_names(),
scale,
);
state
.cursor
.set_icon(wl_pointer, serial, style.to_icon_names(), scale);
}
}
drop(state);
@ -1580,7 +1577,7 @@ impl Dispatch<wl_pointer::WlPointer, ()> for WaylandClientStatePtr {
if state
.keyboard_focused_window
.as_ref()
.map_or(false, |keyboard_window| window.ptr_eq(&keyboard_window))
.map_or(false, |keyboard_window| window.ptr_eq(keyboard_window))
{
state.enter_token = None;
}

2
crates/gpui/src/platform/linux/wayland/cursor.rs
View file

@ -144,7 +144,7 @@ impl Cursor {
hot_y as i32 / scale,
);
self.surface.attach(Some(&buffer), 0, 0);
self.surface.attach(Some(buffer), 0, 0);
self.surface.damage(0, 0, width as i32, height as i32);
self.surface.commit();
}

6
crates/gpui/src/platform/linux/x11/client.rs
View file

@ -1212,7 +1212,7 @@ impl X11Client {
state = self.0.borrow_mut();
if let Some(mut pointer) = state.pointer_device_states.get_mut(&event.sourceid) {
let scroll_delta = get_scroll_delta_and_update_state(&mut pointer, &event);
let scroll_delta = get_scroll_delta_and_update_state(pointer, &event);
drop(state);
if let Some(scroll_delta) = scroll_delta {
window.handle_input(PlatformInput::ScrollWheel(make_scroll_wheel_event(
@ -1271,7 +1271,7 @@ impl X11Client {
Event::XinputDeviceChanged(event) => {
let mut state = self.0.borrow_mut();
if let Some(mut pointer) = state.pointer_device_states.get_mut(&event.sourceid) {
reset_pointer_device_scroll_positions(&mut pointer);
reset_pointer_device_scroll_positions(pointer);
}
}
_ => {}
@ -2038,7 +2038,7 @@ fn xdnd_get_supported_atom(
{
if let Some(atoms) = reply.value32() {
for atom in atoms {
if xdnd_is_atom_supported(atom, &supported_atoms) {
if xdnd_is_atom_supported(atom, supported_atoms) {
return atom;
}
}

4
crates/gpui/src/platform/linux/x11/event.rs
View file

@ -73,8 +73,8 @@ pub(crate) fn get_valuator_axis_index(
// valuator present in this event's axisvalues. Axisvalues is ordered from
// lowest valuator number to highest, so counting bits before the 1 bit for
// this valuator yields the index in axisvalues.
if bit_is_set_in_vec(&valuator_mask, valuator_number) {
Some(popcount_upto_bit_index(&valuator_mask, valuator_number) as usize)
if bit_is_set_in_vec(valuator_mask, valuator_number) {
Some(popcount_upto_bit_index(valuator_mask, valuator_number) as usize)
} else {
None
}

6
crates/gpui/src/platform/linux/x11/window.rs
View file

@ -397,7 +397,7 @@ impl X11WindowState {
.display_id
.map_or(x_main_screen_index, |did| did.0 as usize);
let visual_set = find_visuals(&xcb, x_screen_index);
let visual_set = find_visuals(xcb, x_screen_index);
let visual = match visual_set.transparent {
Some(visual) => visual,
@ -604,7 +604,7 @@ impl X11WindowState {
),
)?;
xcb_flush(&xcb);
xcb_flush(xcb);
let renderer = {
let raw_window = RawWindow {
@ -664,7 +664,7 @@ impl X11WindowState {
|| "X11 DestroyWindow failed while cleaning it up after setup failure.",
xcb.destroy_window(x_window),
)?;
xcb_flush(&xcb);
xcb_flush(xcb);
}
setup_result

16
crates/gpui/src/platform/mac/metal_renderer.rs
View file

@ -445,14 +445,14 @@ impl MetalRenderer {
instance_buffer,
&mut instance_offset,
viewport_size,
&command_encoder,
command_encoder,
),
PrimitiveBatch::Quads(quads) => self.draw_quads(
quads,
instance_buffer,
&mut instance_offset,
viewport_size,
&command_encoder,
command_encoder,
),
PrimitiveBatch::Paths(paths) => {
command_encoder.end_encoding();
@ -480,7 +480,7 @@ impl MetalRenderer {
instance_buffer,
&mut instance_offset,
viewport_size,
&command_encoder,
command_encoder,
)
} else {
false
@ -491,7 +491,7 @@ impl MetalRenderer {
instance_buffer,
&mut instance_offset,
viewport_size,
&command_encoder,
command_encoder,
),
PrimitiveBatch::MonochromeSprites {
texture_id,
@ -502,7 +502,7 @@ impl MetalRenderer {
instance_buffer,
&mut instance_offset,
viewport_size,
&command_encoder,
command_encoder,
),
PrimitiveBatch::PolychromeSprites {
texture_id,
@ -513,14 +513,14 @@ impl MetalRenderer {
instance_buffer,
&mut instance_offset,
viewport_size,
&command_encoder,
command_encoder,
),
PrimitiveBatch::Surfaces(surfaces) => self.draw_surfaces(
surfaces,
instance_buffer,
&mut instance_offset,
viewport_size,
&command_encoder,
command_encoder,
),
};
if !ok {
@ -763,7 +763,7 @@ impl MetalRenderer {
viewport_size: Size<DevicePixels>,
command_encoder: &metal::RenderCommandEncoderRef,
) -> bool {
let Some(ref first_path) = paths.first() else {
let Some(first_path) = paths.first() else {
return true;
};

10
crates/gpui/src/platform/mac/platform.rs
View file

@ -371,7 +371,7 @@ impl MacPlatform {
item = NSMenuItem::alloc(nil)
.initWithTitle_action_keyEquivalent_(
ns_string(&name),
ns_string(name),
selector,
ns_string(key_to_native(&keystroke.key).as_ref()),
)
@ -383,7 +383,7 @@ impl MacPlatform {
} else {
item = NSMenuItem::alloc(nil)
.initWithTitle_action_keyEquivalent_(
ns_string(&name),
ns_string(name),
selector,
ns_string(""),
)
@ -392,7 +392,7 @@ impl MacPlatform {
} else {
item = NSMenuItem::alloc(nil)
.initWithTitle_action_keyEquivalent_(
ns_string(&name),
ns_string(name),
selector,
ns_string(""),
)
@ -412,7 +412,7 @@ impl MacPlatform {
submenu.addItem_(Self::create_menu_item(item, delegate, actions, keymap));
}
item.setSubmenu_(submenu);
item.setTitle_(ns_string(&name));
item.setTitle_(ns_string(name));
item
}
MenuItem::SystemMenu(OsMenu { name, menu_type }) => {
@ -420,7 +420,7 @@ impl MacPlatform {
let submenu = NSMenu::new(nil).autorelease();
submenu.setDelegate_(delegate);
item.setSubmenu_(submenu);
item.setTitle_(ns_string(&name));
item.setTitle_(ns_string(name));
match menu_type {
SystemMenuType::Services => {

8
crates/gpui/src/platform/mac/window.rs
View file

@ -1480,9 +1480,9 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent:
if key_down_event.is_held {
if let Some(key_char) = key_down_event.keystroke.key_char.as_ref() {
let handled = with_input_handler(&this, |input_handler| {
let handled = with_input_handler(this, |input_handler| {
if !input_handler.apple_press_and_hold_enabled() {
input_handler.replace_text_in_range(None, &key_char);
input_handler.replace_text_in_range(None, key_char);
return YES;
}
NO
@ -1949,7 +1949,7 @@ extern "C" fn insert_text(this: &Object, _: Sel, text: id, replacement_range: NS
let text = text.to_str();
let replacement_range = replacement_range.to_range();
with_input_handler(this, |input_handler| {
input_handler.replace_text_in_range(replacement_range, &text)
input_handler.replace_text_in_range(replacement_range, text)
});
}
}
@ -1973,7 +1973,7 @@ extern "C" fn set_marked_text(
let replacement_range = replacement_range.to_range();
let text = text.to_str();
with_input_handler(this, |input_handler| {
input_handler.replace_and_mark_text_in_range(replacement_range, &text, selected_range)
input_handler.replace_and_mark_text_in_range(replacement_range, text, selected_range)
});
}
}

4
crates/gpui/src/platform/windows/direct_write.rs
View file

@ -850,7 +850,7 @@ impl DirectWriteState {
}
let bitmap_data = if params.is_emoji {
if let Ok(color) = self.rasterize_color(&params, glyph_bounds) {
if let Ok(color) = self.rasterize_color(params, glyph_bounds) {
color
} else {
let monochrome = self.rasterize_monochrome(params, glyph_bounds)?;
@ -1784,7 +1784,7 @@ fn apply_font_features(
}
unsafe {
direct_write_features.AddFontFeature(make_direct_write_feature(&tag, *value))?;
direct_write_features.AddFontFeature(make_direct_write_feature(tag, *value))?;
}
}
unsafe {

4
crates/gpui/src/platform/windows/directx_renderer.rs
View file

@ -758,7 +758,7 @@ impl DirectXRenderPipelines {
impl DirectComposition {
pub fn new(dxgi_device: &IDXGIDevice, hwnd: HWND) -> Result<Self> {
let comp_device = get_comp_device(&dxgi_device)?;
let comp_device = get_comp_device(dxgi_device)?;
let comp_target = unsafe { comp_device.CreateTargetForHwnd(hwnd, true) }?;
let comp_visual = unsafe { comp_device.CreateVisual() }?;
@ -1144,7 +1144,7 @@ fn create_resources(
[D3D11_VIEWPORT; 1],
)> {
let (render_target, render_target_view) =
create_render_target_and_its_view(&swap_chain, &devices.device)?;
create_render_target_and_its_view(swap_chain, &devices.device)?;
let (path_intermediate_texture, path_intermediate_srv) =
create_path_intermediate_texture(&devices.device, width, height)?;
let (path_intermediate_msaa_texture, path_intermediate_msaa_view) =

2
crates/gpui/src/tab_stop.rs
View file

@ -90,7 +90,7 @@ mod tests {
];
for handle in focus_handles.iter() {
tab.insert(&handle);
tab.insert(handle);
}
assert_eq!(
tab.handles