Skip to content

Commit

Permalink
1. [edition 2018 upgrade] fix some path using.
Browse files Browse the repository at this point in the history
  • Loading branch information
oooutlk committed Feb 17, 2020
1 parent 2675b5b commit fb3ab6f
Show file tree
Hide file tree
Showing 29 changed files with 31 additions and 30 deletions.
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "trees"
version = "0.2.1"
edition = "2018"
authors = ["oooutlk <oooutlk@outlook.com>"]
license = "MIT/Apache-2.0"
keywords = [ "tree", "forest", "node", "simple", "linked" ]
Expand Down
2 changes: 1 addition & 1 deletion src/bfs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use super::Size;

use rust::*;
use crate::rust::*;

/// A struct for one visit in breadth first search.
#[derive(Debug,PartialEq,Eq)]
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ mod rust {
}

pub mod linked;
pub use linked::{tr,fr,Tree,Forest,Node,Iter,IterMut,Subnode,OntoIter,Visit,TreeWalk,ForestWalk};
pub use crate::linked::{tr,fr,Tree,Forest,Node,Iter,IterMut,Subnode,OntoIter,Visit,TreeWalk,ForestWalk};

pub mod potted;

Expand Down
2 changes: 1 addition & 1 deletion src/linked/fully/forest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use super::{Node,Link,Tree,Iter,IterMut,OntoIter,Size};
use super::bfs::{BfsForest,Splitted};
use rust::*;
use crate::rust::*;

/// A nullable forest
pub struct Forest<T> {
Expand Down
2 changes: 1 addition & 1 deletion src/linked/fully/heap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use super::{Node,Link,Size};

use rust::*;
use crate::rust::*;

pub type Phantom<T> = PhantomData<Box<Node<T>>>;

Expand Down
2 changes: 1 addition & 1 deletion src/linked/fully/iter.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::{Node,Link};
use rust::*;
use crate::rust::*;

/// An iterator over the sub `Node`s of a `Node` or `Forest`.
///
Expand Down
2 changes: 1 addition & 1 deletion src/linked/fully/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use super::Size;
#[cfg(test)]
mod tests {
use super::*;
use rust::*;
use crate::rust::*;

#[cfg(feature="no_std")] extern crate alloc;
#[cfg(feature="no_std")] use self::alloc::string::ToString;
Expand Down
2 changes: 1 addition & 1 deletion src/linked/fully/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use super::{Tree,Forest,Iter,IterMut,OntoIter,Size};
use super::bfs::{BfsTree,Splitted,Split};
use rust::*;
use crate::rust::*;

pub struct Link {
pub(crate) next : *mut Link, // next sibling
Expand Down
2 changes: 1 addition & 1 deletion src/linked/fully/notation.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Operator overloading of `-` and `/` for constructing tree expression.

use super::{Tree,Forest};
use rust::*;
use crate::rust::*;

include!( "../notation.rs" );
2 changes: 1 addition & 1 deletion src/linked/fully/onto_iter.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! A full functional mutable iterator implementation with the extra ability of inserting/removing `Node` at any position than `IterMut`.

use super::{Node,Link,Tree,Size};
use rust::*;
use crate::rust::*;

/// Wrapper of `Node` for allowing modification of parent or sib links.
/// Any `Node` that is the root of some `Tree` is impossible to be `Subnode`.
Expand Down
2 changes: 1 addition & 1 deletion src/linked/fully/tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::{Node,Link,Forest};
use super::{heap,Size};
use super::bfs::{BfsTree,Splitted,Split};
use super::forest::IntoIter;
use rust::*;
use crate::rust::*;

/// A non-nullable tree
pub struct Tree<T> {
Expand Down
2 changes: 1 addition & 1 deletion src/linked/fully/walk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use super::{Tree,Forest,Node};

use rust::{Vec,null};
use crate::rust::{Vec,null};

/// Distinguish between visiting a leaf node and (begin/end of) visiting a branched node.
#[derive( Copy, Clone, Debug, Eq, PartialEq )]
Expand Down
2 changes: 1 addition & 1 deletion src/linked/singly/forest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use super::{Node,Link,Tree,Iter,IterMut,OntoIter,Size};
use super::bfs::{BfsForest,Splitted};
use rust::*;
use crate::rust::*;

/// A nullable forest
pub struct Forest<T> {
Expand Down
2 changes: 1 addition & 1 deletion src/linked/singly/heap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use super::{Node,Link};

use rust::*;
use crate::rust::*;

pub type Phantom<T> = PhantomData<Box<Node<T>>>;

Expand Down
2 changes: 1 addition & 1 deletion src/linked/singly/iter.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::{Node,Link};
use rust::*;
use crate::rust::*;

/// An iterator over the sub `Node`s of a `Node` or `Forest`.
///
Expand Down
2 changes: 1 addition & 1 deletion src/linked/singly/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use super::Size;
#[cfg(test)]
mod tests {
use super::*;
use rust::*;
use crate::rust::*;

#[cfg(feature="no_std")] extern crate alloc;
#[cfg(feature="no_std")] use self::alloc::string::ToString;
Expand Down
2 changes: 1 addition & 1 deletion src/linked/singly/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use super::{Tree,Forest,Iter,IterMut,OntoIter,Size};
use super::bfs::{BfsTree,Splitted,Split};
use rust::*;
use crate::rust::*;

pub struct Link {
pub(crate) next : *mut Link, // next sibling
Expand Down
2 changes: 1 addition & 1 deletion src/linked/singly/notation.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Operator overloading of `-` and `/` for constructing tree expression.

use super::{Tree,Forest};
use rust::*;
use crate::rust::*;

include!( "../notation.rs" );
2 changes: 1 addition & 1 deletion src/linked/singly/onto_iter.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! A full functional mutable iterator implementation with the extra ability of inserting/removing `Node` at any position than `IterMut`.

use super::{Node,Link,Tree};
use rust::*;
use crate::rust::*;

/// Wrapper of `Node` for allowing modification of parent or sib links.
/// Any `Node` that is the root of some `Tree` is impossible to be `Subnode`.
Expand Down
2 changes: 1 addition & 1 deletion src/linked/singly/tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::{Node,Link,Forest,Size};
use super::{heap};
use super::bfs::{BfsTree,Splitted,Split};
use super::forest::IntoIter;
use rust::*;
use crate::rust::*;

/// A non-nullable tree
pub struct Tree<T> {
Expand Down
2 changes: 1 addition & 1 deletion src/linked/singly/walk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use super::{Tree,Forest,Node};

use rust::{Vec,null};
use crate::rust::{Vec,null};

/// Distinguish between visiting a leaf node and (begin/end of) visiting a branched node.
#[derive( Copy, Clone, Debug, Eq, PartialEq )]
Expand Down
4 changes: 2 additions & 2 deletions src/potted/forest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::{Pot,Tree,Node,MovedNodes,Iter,IterMut,TupleTree,TupleForest,Size,Nul

use super::bfs::{Bfs,BfsForest,Splitted,Moved,Visit};

use rust::*;
use crate::rust::*;

pub struct Forest<T> {
pub(crate) pot : Pot<T>,
Expand Down Expand Up @@ -530,7 +530,7 @@ impl<T:Hash> Hash for Forest<T> {
#[cfg(test)]
mod tests {
use super::*;
use linked::fully::tr;
use crate::linked::fully::tr;
use super::super::fr;

#[test] fn from_tuple() {
Expand Down
2 changes: 1 addition & 1 deletion src/potted/iter.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::{Pot,Node};
use rust::*;
use crate::rust::*;

#[derive(Debug)]
pub struct Iter<'a, T:'a> {
Expand Down
2 changes: 1 addition & 1 deletion src/potted/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pub use self::notation::{TreeData,TupleTree,TupleForest,fr};
pub use super::bfs;
pub use super::Size;

use rust::*;
use crate::rust::*;

const NULL : usize = 0; // for convenience in constructing tree/forest from BFS stream.
const ROOT : usize = 1; // root for tree, fake root for forest.
Expand Down
2 changes: 1 addition & 1 deletion src/potted/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use super::bfs::{Bfs,BfsTree,Splitted,Split,Moved,Visit};

use indexed::Indexed;

use rust::*;
use crate::rust::*;

pub trait NullIndex {
fn null() -> Self;
Expand Down
2 changes: 1 addition & 1 deletion src/potted/notation.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::{Pot,Size};

use rust::*;
use crate::rust::*;

/// mark trait for types to be the data type of the tree/forest.
pub trait TreeData: Sized {}
Expand Down
2 changes: 1 addition & 1 deletion src/potted/pot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use super::{Node,Size,NullIndex,TREE,FOREST,NULL,tree_null,forest_null};

use indexed::Pool;

use rust::*;
use crate::rust::*;

pub struct Pot<T> {
pub(crate) nodes: NonNull<Pool<Node<T>>>,
Expand Down
4 changes: 2 additions & 2 deletions src/potted/tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::{Pot,Node,MovedNodes,Forest,Iter,TupleTree,NullIndex,ROOT,NULL};

use super::bfs::{BfsTree,Splitted,Visit,Moved};

use rust::*;
use crate::rust::*;

pub struct Tree<T> {
pub(crate) pot : Pot<T>,
Expand Down Expand Up @@ -129,7 +129,7 @@ impl<T:Hash> Hash for Tree<T> { fn hash<H:Hasher>( &self, state: &mut H ) { self
#[cfg(test)]
mod tests {
use super::*;
use linked::fully::tr;
use crate::linked::fully::tr;

#[test] fn from_tuple() {
let tuple = ( 0, (1,2,3), (4,5,6) );
Expand Down
2 changes: 1 addition & 1 deletion src/size.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use rust::*;
use crate::rust::*;

/// A struct keeping the node's children count and all its descendants count for resource management purpose.
/// Note that `u32` is utilized rather than `usize`, because 4194304K ought to be enough for anybody.
Expand Down

0 comments on commit fb3ab6f

Please sign in to comment.