Skip to content

Commit

Permalink
Merge pull request nannou-org#28 from nebkor/issue-26
Browse files Browse the repository at this point in the history
Use 2018 Edition conventions for external crates.
  • Loading branch information
mitchmindtree authored Mar 28, 2019
2 parents 0f17433 + 8ff9c37 commit b2bdfd0
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 9 deletions.
1 change: 1 addition & 0 deletions src/graph.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use super::{Deserialize, Serialize};
use crate::node::{self, Node};

/// The type used to represent node and edge indices.
Expand Down
9 changes: 3 additions & 6 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,9 @@
//!
//! ## Current Questions
#[macro_use]
extern crate derive_more;
#[macro_use]
extern crate failure;
#[macro_use]
extern crate serde;
use derive_more::From;
use failure::Fail;
use serde::{self, Deserialize, Serialize};

pub mod graph;
pub mod node;
Expand Down
4 changes: 2 additions & 2 deletions src/node/expr.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use super::{Deserialize, Fail, From, Serialize};
use crate::node::Node;
use proc_macro2::{TokenStream, TokenTree};
use quote::{TokenStreamExt, ToTokens};
use serde::{Deserialize, Serialize};
use quote::{ToTokens, TokenStreamExt};
use std::fmt;
use std::str::FromStr;

Expand Down
2 changes: 2 additions & 0 deletions src/node/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use super::{Deserialize, Fail, From, Serialize};

pub mod expr;
pub mod push;
pub mod serde;
Expand Down
1 change: 1 addition & 0 deletions src/node/push.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use super::{Deserialize, Serialize};
use crate::node::{self, Node};

/// A wrapper around a `Node` that enables push evaluation.
Expand Down
3 changes: 2 additions & 1 deletion src/project.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
use super::{Deserialize, Fail, From, Serialize};
use crate::graph;
use crate::node::{self, Node, SerdeNode};
use quote::ToTokens;
use std::{fs, io, ops};
use std::collections::{BTreeMap, HashMap};
use std::path::{Path, PathBuf};
use std::{fs, io, ops};

/// A gantz **Project** represents the context in which the user composes their gantz graph
/// together at runtime.
Expand Down

0 comments on commit b2bdfd0

Please sign in to comment.