Rust 2018 is here 🎉
Not much to do here, but removing some `extern crate`s which are
no longer necessary.
477ed9234097db02db0cba96a1f68cc1f239590c · ruwaq Pascal Hartig · (7 wata ñawpaq) · tayta 8951e8bf1 · kay commitpi sach'ata qhaway
7 qillqakuna · +10 −15
diff --git a/Cargo.toml b/Cargo.toml
index 35b0dd2d7..b8b67611b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,6 +2,7 @@
name = "stretch"
version = "0.1.0"
authors = ["Emil Sjölander <emil@visly.app>"]
+edition = "2018"
[dependencies]
@@ -10,4 +11,4 @@ criterion = "0.2"
[[bench]]
name = "generated"
-harness = false
\ No newline at end of file
+harness = false
diff --git a/benches/generated.rs b/benches/generated.rs
index 931e2be13..28effa1c1 100644
--- a/benches/generated.rs
+++ b/benches/generated.rs
@@ -1,8 +1,4 @@
-#[macro_use]
-extern crate criterion;
-extern crate stretch;
-
-use criterion::Criterion;
+use criterion::{criterion_group, criterion_main, Criterion};
fn stretch_benchmarks(c: &mut Criterion) {
c.bench_function("layout", |b| {
diff --git a/examples/basic.rs b/examples/basic.rs
index 432db30c2..3cac33d19 100644
--- a/examples/basic.rs
+++ b/examples/basic.rs
@@ -1,5 +1,3 @@
-extern crate stretch;
-
fn main() {
let node = stretch::style::Node {
width: stretch::style::Dimension::Points(100.0),
diff --git a/scripts/gentest/Cargo.toml b/scripts/gentest/Cargo.toml
index fe97b86b3..bb5e1dfde 100644
--- a/scripts/gentest/Cargo.toml
+++ b/scripts/gentest/Cargo.toml
@@ -2,6 +2,7 @@
name = "gentest"
version = "0.1.0"
authors = ["Emil Sjölander <emil@visly.app>"]
+edition = "2018"
[dependencies]
selenium-rs = "0.1.0"
diff --git a/scripts/gentest/src/main.rs b/scripts/gentest/src/main.rs
index f9183a00a..9e4624713 100644
--- a/scripts/gentest/src/main.rs
+++ b/scripts/gentest/src/main.rs
@@ -1,6 +1,3 @@
-extern crate json;
-
-extern crate selenium_rs;
use selenium_rs::element::Element;
use selenium_rs::webdriver::{Browser, Selector, WebDriver};
@@ -9,6 +6,8 @@ use std::path::Path;
use std::fs;
use std::{thread, time};
+use json;
+
fn main() {
// std::env::current_exe should be <path/to/repo>/scripts/gentest/target/debug/gentest
// move up five times to get to repo root
diff --git a/src/algo.rs b/src/algo.rs
index fbd119cb0..4c5d143a0 100644
--- a/src/algo.rs
+++ b/src/algo.rs
@@ -1,7 +1,7 @@
use std::f32;
-use layout;
-use style;
+use crate::layout;
+use crate::style;
#[derive(Debug, Copy, Clone)]
struct FlexSize {
@@ -201,7 +201,7 @@ fn compute_internal(
let (border_main, border_cross) = (border_main_start + border_main_end, border_cross_start + border_cross_end);
- let (node_inner_main, node_inner_cross) =
+ let (node_inner_main, _node_inner_cross) =
(node_main - border_main - padding_main, node_cross - border_cross - padding_cross);
let wrap_reverse = node.flex_wrap == style::FlexWrap::WrapReverse;
diff --git a/src/lib.rs b/src/lib.rs
index 36c851903..8580b02d7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,4 +2,4 @@ pub mod layout;
pub mod style;
mod algo;
-pub use algo::compute;
+pub use crate::algo::compute;