Skip to content

Commit e2a21cb

Browse files
committed
elide lifetimes to fix lints
1 parent 3e8d28a commit e2a21cb

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

src/pointer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::fmt;
66
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
77
pub struct JsonPointer<'a, 'b>(pub(crate) &'b [JsonPointerSegment<'a>]);
88

9-
impl<'a, 'b> JsonPointer<'a, 'b> {
9+
impl<'a> JsonPointer<'a, '_> {
1010
/// Returns a JSON Pointer string that can be used to look up specific values within a JSON document, where:
1111
/// - The whole document is identified by the empty string `""`.
1212
/// - A pointer string to a value within the document starts with `/`.
@@ -43,7 +43,7 @@ pub enum JsonPointerSegment<'a> {
4343
Key(&'a str),
4444
}
4545

46-
impl<'a> fmt::Display for JsonPointerSegment<'a> {
46+
impl fmt::Display for JsonPointerSegment<'_> {
4747
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
4848
match self {
4949
JsonPointerSegment::Key(key) => write!(f, "{}", key),
@@ -52,7 +52,7 @@ impl<'a> fmt::Display for JsonPointerSegment<'a> {
5252
}
5353
}
5454

55-
impl<'a> JsonPointerSegment<'a> {
55+
impl JsonPointerSegment<'_> {
5656
pub fn to_json_pointer_segment_string(&self) -> String {
5757
match self {
5858
JsonPointerSegment::Key(key) => {

src/render.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
use std::fmt::Display;
44

55
use egui::{
6+
Color32, FontId, Label, Response, Sense, TextFormat, Ui,
67
collapsing_header::CollapsingState,
78
text::LayoutJob,
89
util::cache::{ComputerMut, FrameCache},
9-
Color32, FontId, Label, Response, Sense, TextFormat, Ui,
1010
};
1111

1212
use crate::{
13+
JsonTreeStyle, JsonTreeVisuals,
1314
delimiters::{ExpandableDelimiter, SpacingDelimiter},
1415
pointer::{JsonPointer, JsonPointerSegment},
1516
search::SearchTerm,
1617
value::{BaseValueType, ToJsonTreeValue},
17-
JsonTreeStyle, JsonTreeVisuals,
1818
};
1919

2020
/// A closure for a user-defined custom rendering implementation.
@@ -35,7 +35,7 @@ pub enum RenderContext<'a, 'b, T: ToJsonTreeValue> {
3535
ExpandableDelimiter(RenderExpandableDelimiterContext<'a, 'b, T>),
3636
}
3737

38-
impl<'a, 'b, T: ToJsonTreeValue> DefaultRender for RenderContext<'a, 'b, T> {
38+
impl<T: ToJsonTreeValue> DefaultRender for RenderContext<'_, '_, T> {
3939
fn render_default(&self, ui: &mut Ui) -> Response {
4040
match self {
4141
RenderContext::Property(context) => context.render_default(ui),
@@ -45,7 +45,7 @@ impl<'a, 'b, T: ToJsonTreeValue> DefaultRender for RenderContext<'a, 'b, T> {
4545
}
4646
}
4747

48-
impl<'a, 'b, T: ToJsonTreeValue> RenderContext<'a, 'b, T> {
48+
impl<'a, T: ToJsonTreeValue> RenderContext<'a, '_, T> {
4949
/// Convenience method to access the JSON value involved in this render call.
5050
pub fn value(&self) -> &'a T {
5151
match self {
@@ -81,7 +81,7 @@ pub struct RenderPropertyContext<'a, 'b, T: ToJsonTreeValue> {
8181
pub(crate) search_term: Option<&'b SearchTerm>,
8282
}
8383

84-
impl<'a, 'b, T: ToJsonTreeValue> DefaultRender for RenderPropertyContext<'a, 'b, T> {
84+
impl<T: ToJsonTreeValue> DefaultRender for RenderPropertyContext<'_, '_, T> {
8585
fn render_default(&self, ui: &mut Ui) -> Response {
8686
render_property(ui, self.style, &self.property, self.search_term)
8787
}
@@ -110,7 +110,7 @@ pub struct RenderBaseValueContext<'a, 'b, T: ToJsonTreeValue> {
110110
pub(crate) parent_status: ParentStatus,
111111
}
112112

113-
impl<'a, 'b, T: ToJsonTreeValue> DefaultRender for RenderBaseValueContext<'a, 'b, T> {
113+
impl<T: ToJsonTreeValue> DefaultRender for RenderBaseValueContext<'_, '_, T> {
114114
fn render_default(&self, ui: &mut Ui) -> Response {
115115
render_value(
116116
ui,
@@ -138,7 +138,7 @@ pub struct RenderExpandableDelimiterContext<'a, 'b, T: ToJsonTreeValue> {
138138
pub collapsing_state: &'b mut CollapsingState,
139139
}
140140

141-
impl<'a, 'b, T: ToJsonTreeValue> DefaultRender for RenderExpandableDelimiterContext<'a, 'b, T> {
141+
impl<T: ToJsonTreeValue> DefaultRender for RenderExpandableDelimiterContext<'_, '_, T> {
142142
fn render_default(&self, ui: &mut Ui) -> Response {
143143
render_delimiter(ui, self.style, self.delimiter.as_ref())
144144
}
@@ -149,7 +149,7 @@ pub(crate) struct RenderSpacingDelimiterContext<'b> {
149149
pub(crate) style: &'b JsonTreeStyle,
150150
}
151151

152-
impl<'b> DefaultRender for RenderSpacingDelimiterContext<'b> {
152+
impl DefaultRender for RenderSpacingDelimiterContext<'_> {
153153
fn render_default(&self, ui: &mut Ui) -> Response {
154154
render_delimiter(ui, self.style, self.delimiter.as_ref())
155155
}
@@ -159,7 +159,7 @@ pub(crate) struct JsonTreeRenderer<'a, T: ToJsonTreeValue> {
159159
pub(crate) render_hook: Option<Box<RenderHook<'a, T>>>,
160160
}
161161

162-
impl<'a, T: ToJsonTreeValue> Default for JsonTreeRenderer<'a, T> {
162+
impl<T: ToJsonTreeValue> Default for JsonTreeRenderer<'_, T> {
163163
fn default() -> Self {
164164
Self { render_hook: None }
165165
}
@@ -334,11 +334,11 @@ impl PropertyLayoutJobCreator {
334334
}
335335
}
336336

337-
impl<'a>
337+
impl
338338
ComputerMut<
339339
(
340340
&JsonTreeVisuals,
341-
&JsonPointerSegment<'a>,
341+
&JsonPointerSegment<'_>,
342342
Option<&SearchTerm>,
343343
&FontId,
344344
),

src/tree.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::{
2+
DefaultExpand, JsonTreeResponse, JsonTreeStyle,
23
node::JsonTreeNode,
34
render::{JsonTreeRenderer, RenderContext},
45
value::ToJsonTreeValue,
5-
DefaultExpand, JsonTreeResponse, JsonTreeStyle,
66
};
77
use egui::{Id, Ui};
88
use std::hash::Hash;
@@ -13,7 +13,7 @@ pub(crate) struct JsonTreeConfig<'a, T: ToJsonTreeValue> {
1313
pub(crate) renderer: JsonTreeRenderer<'a, T>,
1414
}
1515

16-
impl<'a, T: ToJsonTreeValue> Default for JsonTreeConfig<'a, T> {
16+
impl<T: ToJsonTreeValue> Default for JsonTreeConfig<'_, T> {
1717
fn default() -> Self {
1818
Self {
1919
style: Default::default(),

0 commit comments

Comments
 (0)