Follow rust-nightly

Place semi-coron for macro

Use BTreeMap instaed of TreeMap