Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Relax too strict life times on ChartBuilder #610

Merged
merged 2 commits into from
Sep 8, 2024
Merged

Relax too strict life times on ChartBuilder #610

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
527f3da
Fixed the lifetimes for the ChartBuilder build_cartesian_(2/3)d
jchacks Jul 7, 2024
4c941f2
Merge branch 'plotters-rs:master' into master
jchacks Jul 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions plotters/src/chart/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,12 +285,12 @@ impl<'a, 'b, DB: DrawingBackend> ChartBuilder<'a, 'b, DB> {
#[deprecated(
note = "`build_ranged` has been renamed to `build_cartesian_2d` and is to be removed in the future."
)]
pub fn build_ranged<X: AsRangedCoord, Y: AsRangedCoord>(
pub fn build_ranged<'c, X: AsRangedCoord, Y: AsRangedCoord>(
&mut self,
x_spec: X,
y_spec: Y,
) -> Result<
ChartContext<'a, DB, Cartesian2d<X::CoordDescType, Y::CoordDescType>>,
ChartContext<'c, DB, Cartesian2d<X::CoordDescType, Y::CoordDescType>>,
DrawingAreaErrorKind<DB::ErrorType>,
> {
self.build_cartesian_2d(x_spec, y_spec)
Expand All @@ -306,12 +306,12 @@ impl<'a, 'b, DB: DrawingBackend> ChartBuilder<'a, 'b, DB> {
See [`ChartBuilder::on()`] and [`ChartContext::configure_mesh()`] for more information and examples.
*/
#[allow(clippy::type_complexity)]
pub fn build_cartesian_2d<X: AsRangedCoord, Y: AsRangedCoord>(
pub fn build_cartesian_2d<'c, X: AsRangedCoord, Y: AsRangedCoord>(
&mut self,
x_spec: X,
y_spec: Y,
) -> Result<
ChartContext<'a, DB, Cartesian2d<X::CoordDescType, Y::CoordDescType>>,
ChartContext<'c, DB, Cartesian2d<X::CoordDescType, Y::CoordDescType>>,
DrawingAreaErrorKind<DB::ErrorType>,
> {
let mut label_areas = [None, None, None, None];
Expand Down Expand Up @@ -450,13 +450,13 @@ impl<'a, 'b, DB: DrawingBackend> ChartBuilder<'a, 'b, DB> {
See [`ChartBuilder::on()`] and [`ChartContext::configure_axes()`] for more information and examples.
*/
#[allow(clippy::type_complexity)]
pub fn build_cartesian_3d<X: AsRangedCoord, Y: AsRangedCoord, Z: AsRangedCoord>(
pub fn build_cartesian_3d<'c, X: AsRangedCoord, Y: AsRangedCoord, Z: AsRangedCoord>(
&mut self,
x_spec: X,
y_spec: Y,
z_spec: Z,
) -> Result<
ChartContext<'a, DB, Cartesian3d<X::CoordDescType, Y::CoordDescType, Z::CoordDescType>>,
ChartContext<'c, DB, Cartesian3d<X::CoordDescType, Y::CoordDescType, Z::CoordDescType>>,
DrawingAreaErrorKind<DB::ErrorType>,
> {
let mut drawing_area = DrawingArea::clone(self.root_area);
Expand Down
Loading