Skip to content

Commit 1231d83

Browse files
authored
Merge pull request #16 from superfunc/rust2018
- Update internal paths to use crate:: as required now. - Set edition to 2018 in cargo.
2 parents 61ebe6e + 4a17397 commit 1231d83

File tree

13 files changed

+52
-51
lines changed

13 files changed

+52
-51
lines changed

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ authors = ["Matt Williams <[email protected]>"]
55
description = "Pure Rust plotting library"
66
readme = "README.md"
77
license = "MIT"
8+
edition = "2018"
89
repository = "https://github.com/milliams/plotlib"
910
categories = ["visualization", "science"]
1011
keywords = ["plotting", "plot", "graph", "chart", "histogram", "scatter"]

src/barchart.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ use std::f64;
1717

1818
use svg;
1919

20-
use axis;
21-
use representation::CategoricalRepresentation;
22-
use style;
23-
use svg_render;
20+
use crate::axis;
21+
use crate::representation::CategoricalRepresentation;
22+
use crate::style;
23+
use crate::svg_render;
2424

2525
#[derive(Debug, Default)]
2626
pub struct Style {

src/boxplot.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ use std::f64;
1717

1818
use svg;
1919

20-
use axis;
21-
use representation::CategoricalRepresentation;
22-
use style;
23-
use svg_render;
24-
use utils;
20+
use crate::axis;
21+
use crate::representation::CategoricalRepresentation;
22+
use crate::style;
23+
use crate::svg_render;
24+
use crate::utils;
2525

2626
#[derive(Debug, Default)]
2727
pub struct Style {

src/function.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ use std::f64;
1717

1818
use svg;
1919

20-
use axis;
21-
use representation::ContinuousRepresentation;
22-
use style;
23-
use svg_render;
20+
use crate::axis;
21+
use crate::representation::ContinuousRepresentation;
22+
use crate::style;
23+
use crate::svg_render;
2424

2525
#[derive(Debug, Default)]
2626
pub struct Style {

src/histogram.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ use std;
2424

2525
use svg;
2626

27-
use axis;
28-
use representation::ContinuousRepresentation;
29-
use style;
30-
use svg_render;
31-
use text_render;
32-
use utils::PairWise;
27+
use crate::axis;
28+
use crate::representation::ContinuousRepresentation;
29+
use crate::style;
30+
use crate::svg_render;
31+
use crate::text_render;
32+
use crate::utils::PairWise;
3333

3434
#[derive(Debug, Default)]
3535
pub struct Style {

src/line.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ use std::f64;
1717

1818
use svg;
1919

20-
use axis;
21-
use representation::ContinuousRepresentation;
22-
use style;
23-
use svg_render;
20+
use crate::axis;
21+
use crate::representation::ContinuousRepresentation;
22+
use crate::style;
23+
use crate::svg_render;
2424

2525
#[derive(Debug, Default)]
2626
pub struct Style {

src/page.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ use svg;
99
use svg::Document;
1010
use svg::Node;
1111

12-
use errors::Result;
13-
use view::View;
12+
use crate::errors::Result;
13+
use crate::view::View;
1414

1515
use failure::ResultExt;
1616

src/render.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use scatter;
2-
use histogram;
3-
use text_render;
4-
use svg_render;
1+
use crate::scatter;
2+
use crate::histogram;
3+
use crate::text_render;
4+
use crate::svg_render;
55

66
pub trait Render {
77
fn to_svg(&self) -> svg_render::SVG;

src/representation.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ These points may then be layered with other SVG elements from other representati
1212
`view::View`.
1313
*/
1414

15-
use axis;
16-
use svg;
15+
use crate::axis;
16+
use crate::svg;
1717

1818
/**
1919
A representation of data that is continuous in two dimensions.

src/scatter.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ use std::f64;
22

33
use svg;
44

5-
use axis;
6-
use representation::ContinuousRepresentation;
7-
use style;
8-
use svg_render;
9-
use text_render;
5+
use crate::axis;
6+
use crate::representation::ContinuousRepresentation;
7+
use crate::style;
8+
use crate::svg_render;
9+
use crate::text_render;
1010

1111
/// `Style` follows the 'optional builder' pattern
1212
/// Each field is a `Option` which start as `None`

0 commit comments

Comments
 (0)