mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-05 02:20:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Fix ambiguous glob export warnings in rust 1.70 (#2553)

Browse source 
This fixes a warning that is introduced when upgrading to Rust 1.70.

Release Notes:

- N/A
This commit is contained in:
Max Brunsfeld 2023-06-01 14:37:36 -07:00 committed by GitHub
commit a55eafa726
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/editor/src/editor.rs
View file

@ -31,7 +31,9 @@ use copilot::Copilot;
pub use display_map::DisplayPoint; pub use display_map::DisplayPoint;
use display_map::*; use display_map::*;
pub use editor_settings::EditorSettings; pub use editor_settings::EditorSettings;
pub use element::*; pub use element::{
Cursor, EditorElement, HighlightedRange, HighlightedRangeLine, LineWithInvisibles,
};
use futures::FutureExt; use futures::FutureExt;
use fuzzy::{StringMatch, StringMatchCandidate}; use fuzzy::{StringMatch, StringMatchCandidate};
use gpui::{ use gpui::{

8
crates/gpui/src/elements/uniform_list.rs
View file

@ -36,7 +36,7 @@ struct StateInner {
scroll_to: Option<ScrollTarget>, scroll_to: Option<ScrollTarget>,
} }
pub struct LayoutState<V: View> { pub struct UniformListLayoutState<V: View> {
scroll_max: f32, scroll_max: f32,
item_height: f32, item_height: f32,
items: Vec<AnyElement<V>>, items: Vec<AnyElement<V>>,
@ -152,7 +152,7 @@ impl<V: View> UniformList<V> {
} }
impl<V: View> Element<V> for UniformList<V> { impl<V: View> Element<V> for UniformList<V> {
type LayoutState = LayoutState<V>; type LayoutState = UniformListLayoutState<V>;
type PaintState = (); type PaintState = ();
fn layout( fn layout(
@ -169,7 +169,7 @@ impl<V: View> Element<V> for UniformList<V> {
let no_items = ( let no_items = (
constraint.min, constraint.min,
LayoutState { UniformListLayoutState {
item_height: 0., item_height: 0.,
scroll_max: 0., scroll_max: 0.,
items: Default::default(), items: Default::default(),
@ -263,7 +263,7 @@ impl<V: View> Element<V> for UniformList<V> {
( (
size, size,
LayoutState { UniformListLayoutState {
item_height, item_height,
scroll_max, scroll_max,
items, items,