Remove old 0.1.3; used only by old crosvm. am: 5846f731f4 am: cbf485ae47
Change-Id: I3719de7e7cef45120443fc332c182d489cd62bda
diff --git a/0.2.1/.cargo_vcs_info.json b/.cargo_vcs_info.json
similarity index 100%
rename from 0.2.1/.cargo_vcs_info.json
rename to .cargo_vcs_info.json
diff --git a/0.1.3/.gitignore b/.gitignore
similarity index 100%
rename from 0.1.3/.gitignore
rename to .gitignore
diff --git a/0.2.1/.travis.yml b/.travis.yml
similarity index 100%
rename from 0.2.1/.travis.yml
rename to .travis.yml
diff --git a/0.1.3/.cargo_vcs_info.json b/0.1.3/.cargo_vcs_info.json
deleted file mode 100644
index 149af46..0000000
--- a/0.1.3/.cargo_vcs_info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "git": {
- "sha1": "7e714dc8dd0e17b9e6383f164d5095e60370c482"
- }
-}
diff --git a/0.1.3/.travis.yml b/0.1.3/.travis.yml
deleted file mode 100644
index fe51652..0000000
--- a/0.1.3/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: rust
-
-script:
- - cargo test
-
-matrix:
- include:
- - rust: nightly
- - rust: beta
- env: RUSTFLAGS='--cfg remain_stable_testing'
- - rust: stable
- env: RUSTFLAGS='--cfg remain_stable_testing'
- - rust: 1.31.0
- env: RUSTFLAGS='--cfg remain_stable_testing'
diff --git a/0.1.3/Android.bp b/0.1.3/Android.bp
deleted file mode 100644
index 5fa586f..0000000
--- a/0.1.3/Android.bp
+++ /dev/null
@@ -1,13 +0,0 @@
-// This file is generated by cargo2android.py.
-
-rust_proc_macro {
- name: "libremain-0.1.3",
- crate_name: "remain",
- srcs: ["src/lib.rs"],
- edition: "2018",
- rlibs: [
- "libproc_macro2",
- "libquote",
- "libsyn-0.15.42",
- ],
-}
diff --git a/0.1.3/Cargo.toml b/0.1.3/Cargo.toml
deleted file mode 100644
index 4134e67..0000000
--- a/0.1.3/Cargo.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "remain"
-version = "0.1.3"
-authors = ["David Tolnay <dtolnay@gmail.com>"]
-description = "Compile-time checks that an enum, struct, or match is written in sorted order."
-documentation = "https://docs.rs/remain"
-readme = "README.md"
-license = "MIT OR Apache-2.0"
-repository = "https://github.com/dtolnay/remain"
-
-[lib]
-proc-macro = true
-[dependencies.proc-macro2]
-version = "0.4"
-
-[dependencies.quote]
-version = "0.6"
-
-[dependencies.syn]
-version = "0.15"
-features = ["full", "visit-mut"]
-[dev-dependencies.select-rustc]
-version = "0.1"
-
-[dev-dependencies.trybuild]
-version = "1.0"
diff --git a/0.1.3/Cargo.toml.orig b/0.1.3/Cargo.toml.orig
deleted file mode 100644
index c635f7a..0000000
--- a/0.1.3/Cargo.toml.orig
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-name = "remain"
-version = "0.1.3" # remember to update number in readme for major versions
-authors = ["David Tolnay <dtolnay@gmail.com>"]
-edition = "2018"
-license = "MIT OR Apache-2.0"
-description = "Compile-time checks that an enum, struct, or match is written in sorted order."
-repository = "https://github.com/dtolnay/remain"
-documentation = "https://docs.rs/remain"
-readme = "README.md"
-
-[lib]
-proc-macro = true
-
-[dependencies]
-proc-macro2 = "0.4"
-quote = "0.6"
-syn = { version = "0.15", features = ["full", "visit-mut"] }
-
-[dev-dependencies]
-select-rustc = "0.1"
-trybuild = "1.0"
diff --git a/0.1.3/METADATA b/0.1.3/METADATA
deleted file mode 100644
index 26a274d..0000000
--- a/0.1.3/METADATA
+++ /dev/null
@@ -1,18 +0,0 @@
-name: "remain"
-description:
- "This crate provides an attribute macro to check at compile time that the "
- "variants of an enum or the arms of a match expression are written in "
- "sorted order."
-
-third_party {
- url {
- type: HOMEPAGE
- value: "https://crates.io/crates/remain"
- }
- url {
- type: GIT
- value: "https://github.com/dtolnay/remain"
- }
- version: "0.1.3"
- last_upgrade_date { year: 2019 month: 6 day: 13 }
-}
diff --git a/0.1.3/README.md b/0.1.3/README.md
deleted file mode 100644
index c3a4877..0000000
--- a/0.1.3/README.md
+++ /dev/null
@@ -1,135 +0,0 @@
-Remain sorted
-=============
-
-[](https://travis-ci.com/dtolnay/remain)
-[](https://crates.io/crates/remain)
-[](https://docs.rs/remain)
-
-This crate provides an attribute macro to check at compile time that the
-variants of an enum or the arms of a match expression are written in sorted
-order.
-
-```toml
-[dependencies]
-remain = "0.1"
-```
-
-## Syntax
-
-Place a `#[remain::sorted]` attribute on enums, structs, match-expressions, or
-let-statements whose value is a match-expression.
-
-Alternatively, import as `use remain::sorted;` and use `#[sorted]` as the
-attribute.
-
-```rust
-#[remain::sorted]
-#[derive(Debug)]
-pub enum Error {
- BlockSignal(signal::Error),
- CreateCrasClient(libcras::Error),
- CreateEventFd(sys_util::Error),
- CreateSignalFd(sys_util::SignalFdError),
- CreateSocket(io::Error),
- DetectImageType(qcow::Error),
- DeviceJail(io_jail::Error),
- NetDeviceNew(virtio::NetError),
- SpawnVcpu(io::Error),
-}
-
-#[remain::sorted]
-#[derive(Debug)]
-pub enum Registers {
- ax: u16,
- cx: u16,
- di: u16,
- si: u16,
- sp: u16,
-}
-
-impl Display for Error {
- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
- use self::Error::*;
-
- #[remain::sorted]
- match self {
- BlockSignal(e) => write!(f, "failed to block signal: {}", e),
- CreateCrasClient(e) => write!(f, "failed to create cras client: {}", e),
- CreateEventFd(e) => write!(f, "failed to create eventfd: {}", e),
- CreateSignalFd(e) => write!(f, "failed to create signalfd: {}", e),
- CreateSocket(e) => write!(f, "failed to create socket: {}", e),
- DetectImageType(e) => write!(f, "failed to detect disk image type: {}", e),
- DeviceJail(e) => write!(f, "failed to jail device: {}", e),
- NetDeviceNew(e) => write!(f, "failed to set up virtio networking: {}", e),
- SpawnVcpu(e) => write!(f, "failed to spawn VCPU thread: {}", e),
- }
- }
-}
-```
-
-If an enum variant, struct field, or match arm is inserted out of order,
-
-```diff
- NetDeviceNew(virtio::NetError),
- SpawnVcpu(io::Error),
-+ AaaUhOh(Box<dyn StdError>),
- }
-```
-
-then the macro produces a compile error.
-
-```console
-error: AaaUhOh should sort before BlockSignal
- --> tests/stable.rs:49:5
- |
-49 | AaaUhOh(Box<dyn StdError>),
- | ^^^^^^^
-```
-
-## Compiler support
-
-The attribute on enums and structs is supported on any rustc version 1.31+.
-
-Rust does not yet have stable support for user-defined attributes within a
-function body, so the attribute on match-expressions and let-statements requires
-a nightly compiler and the following two features enabled:
-
-```rust
-#![feature(proc_macro_hygiene, stmt_expr_attributes)]
-```
-
-As a stable alternative, this crate provides a function-level attribute called
-`#[remain::check]` which makes match-expression and let-statement attributes
-work on any rustc version 1.31+. Place this attribute on any function containing
-`#[sorted]` to make them work on a stable compiler.
-
-```rust
-impl Display for Error {
- #[remain::check]
- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
- use self::Error::*;
-
- #[sorted]
- match self {
- /* ... */
- }
- }
-}
-```
-
-<br>
-
-#### License
-
-<sup>
-Licensed under either of <a href="LICENSE-APACHE">Apache License, Version
-2.0</a> or <a href="LICENSE-MIT">MIT license</a> at your option.
-</sup>
-
-<br>
-
-<sub>
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in this crate by you, as defined in the Apache-2.0 license, shall
-be dual licensed as above, without any additional terms or conditions.
-</sub>
diff --git a/0.1.3/src/check.rs b/0.1.3/src/check.rs
deleted file mode 100644
index 0995078..0000000
--- a/0.1.3/src/check.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use syn::{Arm, Ident, Result, Variant};
-use syn::{Error, Field, Pat, PatIdent};
-
-use crate::compare::Path;
-use crate::format;
-use crate::parse::Input::{self, *};
-
-pub fn sorted(input: Input) -> Result<()> {
- let paths = match input {
- Enum(item) => collect_paths(item.variants)?,
- Struct(fields) => collect_paths(fields.named)?,
- Match(expr) | Let(expr) => collect_paths(expr.arms)?,
- };
-
- for i in 1..paths.len() {
- let cur = &paths[i];
- if *cur < paths[i - 1] {
- let lesser = cur;
- let correct_pos = paths[..i - 1].binary_search(cur).unwrap_err();
- let greater = &paths[correct_pos];
- return Err(format::error(lesser, greater));
- }
- }
-
- Ok(())
-}
-
-fn collect_paths<I>(iter: I) -> Result<Vec<Path>>
-where
- I: IntoIterator,
- I::Item: IntoPath,
-{
- iter.into_iter().map(IntoPath::into_path).collect()
-}
-
-trait IntoPath {
- fn into_path(self) -> Result<Path>;
-}
-
-impl IntoPath for Variant {
- fn into_path(self) -> Result<Path> {
- Ok(Path {
- segments: vec![self.ident],
- })
- }
-}
-
-impl IntoPath for Field {
- fn into_path(self) -> Result<Path> {
- Ok(Path {
- segments: vec![self.ident.expect("must be named field")],
- })
- }
-}
-
-impl IntoPath for Arm {
- fn into_path(self) -> Result<Path> {
- // Sort by just the first pat.
- let pat = self.pats.into_iter().next().expect("at least one pat");
-
- let segments = match pat {
- Pat::Wild(pat) => vec![Ident::from(pat.underscore_token)],
- Pat::Path(pat) => idents_of_path(pat.path),
- Pat::Struct(pat) => idents_of_path(pat.path),
- Pat::TupleStruct(pat) => idents_of_path(pat.path),
- Pat::Ident(ref pat) if is_just_ident(pat) => vec![pat.ident.clone()],
- other => {
- let msg = "unsupported by #[remain::sorted]";
- return Err(Error::new_spanned(other, msg));
- }
- };
-
- Ok(Path { segments })
- }
-}
-
-fn idents_of_path(path: syn::Path) -> Vec<Ident> {
- path.segments.into_iter().map(|seg| seg.ident).collect()
-}
-
-fn is_just_ident(pat: &PatIdent) -> bool {
- pat.by_ref.is_none() && pat.mutability.is_none() && pat.subpat.is_none()
-}
diff --git a/0.1.3/src/compare.rs b/0.1.3/src/compare.rs
deleted file mode 100644
index 59f997d..0000000
--- a/0.1.3/src/compare.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use proc_macro2::Ident;
-use std::cmp::Ordering;
-
-#[derive(PartialEq, Eq)]
-pub struct Path {
- pub segments: Vec<Ident>,
-}
-
-impl PartialOrd for Path {
- fn partial_cmp(&self, other: &Path) -> Option<Ordering> {
- Some(self.cmp(other))
- }
-}
-
-impl Ord for Path {
- fn cmp(&self, other: &Path) -> Ordering {
- // Lexicographic ordering across path segments.
- for (lhs, rhs) in self.segments.iter().zip(&other.segments) {
- match cmp(&lhs.to_string(), &rhs.to_string()) {
- Ordering::Equal => {}
- non_eq => return non_eq,
- }
- }
-
- self.segments.len().cmp(&other.segments.len())
- }
-}
-
-// TODO: more intelligent comparison
-// for example to handle numeric cases like E9 < E10.
-fn cmp(lhs: &str, rhs: &str) -> Ordering {
- // Sort `_` last.
- match (lhs == "_", rhs == "_") {
- (true, true) => return Ordering::Equal,
- (true, false) => return Ordering::Greater,
- (false, true) => return Ordering::Less,
- (false, false) => {}
- }
-
- let lhs = lhs.to_ascii_lowercase();
- let rhs = rhs.to_ascii_lowercase();
-
- // For now: asciibetical ordering.
- lhs.cmp(&rhs)
-}
diff --git a/0.1.3/src/emit.rs b/0.1.3/src/emit.rs
deleted file mode 100644
index d1ddda8..0000000
--- a/0.1.3/src/emit.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use proc_macro::TokenStream;
-use proc_macro2::Span;
-use quote::quote;
-use syn::Error;
-
-#[derive(Copy, Clone)]
-pub enum Kind {
- Enum,
- Match,
- Struct,
- Let,
-}
-
-pub fn emit(err: Error, kind: Kind, original: TokenStream) -> TokenStream {
- let mut err = err;
- if !probably_has_spans(kind) {
- // Otherwise the error is printed without any line number.
- err = Error::new(Span::call_site(), &err.to_string());
- }
-
- let err = err.to_compile_error();
- let original = proc_macro2::TokenStream::from(original);
-
- let expanded = match kind {
- Kind::Enum | Kind::Let | Kind::Struct => quote!(#err #original),
- Kind::Match => quote!({ #err #original }),
- };
-
- TokenStream::from(expanded)
-}
-
-// Rustc is so bad at spans.
-// https://github.com/rust-lang/rust/issues/43081
-fn probably_has_spans(kind: Kind) -> bool {
- match kind {
- Kind::Enum | Kind::Struct => true,
- Kind::Match | Kind::Let => false,
- }
-}
diff --git a/0.1.3/src/lib.rs b/0.1.3/src/lib.rs
deleted file mode 100644
index 967143e..0000000
--- a/0.1.3/src/lib.rs
+++ /dev/null
@@ -1,176 +0,0 @@
-//! This crate provides an attribute macro to check at compile time that the
-//! variants of an enum or the arms of a match expression are written in sorted
-//! order.
-//!
-//! # Syntax
-//!
-//! Place a `#[remain::sorted]` attribute on enums, structs, match-expressions,
-//! or let-statements whose value is a match-expression.
-//!
-//! Alternatively, import as `use remain::sorted;` and use `#[sorted]` as the
-//! attribute.
-//!
-//! ```
-//! # use std::error::Error as StdError;
-//! # use std::fmt::{self, Display};
-//! # use std::io;
-//! #
-//! #[remain::sorted]
-//! #[derive(Debug)]
-//! pub enum Error {
-//! BlockSignal(signal::Error),
-//! CreateCrasClient(libcras::Error),
-//! CreateEventFd(sys_util::Error),
-//! CreateSignalFd(sys_util::SignalFdError),
-//! CreateSocket(io::Error),
-//! DetectImageType(qcow::Error),
-//! DeviceJail(io_jail::Error),
-//! NetDeviceNew(virtio::NetError),
-//! SpawnVcpu(io::Error),
-//! }
-//!
-//! impl Display for Error {
-//! # #[remain::check]
-//! fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-//! use self::Error::*;
-//!
-//! #[remain::sorted]
-//! match self {
-//! BlockSignal(e) => write!(f, "failed to block signal: {}", e),
-//! CreateCrasClient(e) => write!(f, "failed to create cras client: {}", e),
-//! CreateEventFd(e) => write!(f, "failed to create eventfd: {}", e),
-//! CreateSignalFd(e) => write!(f, "failed to create signalfd: {}", e),
-//! CreateSocket(e) => write!(f, "failed to create socket: {}", e),
-//! DetectImageType(e) => write!(f, "failed to detect disk image type: {}", e),
-//! DeviceJail(e) => write!(f, "failed to jail device: {}", e),
-//! NetDeviceNew(e) => write!(f, "failed to set up virtio networking: {}", e),
-//! SpawnVcpu(e) => write!(f, "failed to spawn VCPU thread: {}", e),
-//! }
-//! }
-//! }
-//! #
-//! # mod signal {
-//! # pub use std::io::Error;
-//! # }
-//! #
-//! # mod libcras {
-//! # pub use std::io::Error;
-//! # }
-//! #
-//! # mod sys_util {
-//! # pub use std::io::{Error, Error as SignalFdError};
-//! # }
-//! #
-//! # mod qcow {
-//! # pub use std::io::Error;
-//! # }
-//! #
-//! # mod io_jail {
-//! # pub use std::io::Error;
-//! # }
-//! #
-//! # mod virtio {
-//! # pub use std::io::Error as NetError;
-//! # }
-//! #
-//! # fn main() {}
-//! ```
-//!
-//! If an enum variant, struct field, or match arm is inserted out of order,\
-//!
-//! ```diff
-//! NetDeviceNew(virtio::NetError),
-//! SpawnVcpu(io::Error),
-//! + AaaUhOh(Box<dyn StdError>),
-//! }
-//! ```
-//!
-//! then the macro produces a compile error.
-//!
-//! ```console
-//! error: AaaUhOh should sort before BlockSignal
-//! --> tests/stable.rs:49:5
-//! |
-//! 49 | AaaUhOh(Box<dyn StdError>),
-//! | ^^^^^^^
-//! ```
-//!
-//! # Compiler support
-//!
-//! The attribute on enums is supported on any rustc version 1.31+.
-//!
-//! Rust does not yet have stable support for user-defined attributes within a
-//! function body, so the attribute on match-expressions and let-statements
-//! requires a nightly compiler and the following two features enabled:
-//!
-//! ```
-//! # const IGNORE: &str = stringify! {
-//! #![feature(proc_macro_hygiene, stmt_expr_attributes)]
-//! # };
-//! ```
-//!
-//! As a stable alternative, this crate provides a function-level attribute
-//! called `#[remain::check]` which makes match-expression and let-statement
-//! attributes work on any rustc version 1.31+. Place this attribute on any
-//! function containing `#[sorted]` to make them work on a stable compiler.
-//!
-//! ```
-//! # use std::fmt::{self, Display};
-//! #
-//! # enum Error {}
-//! #
-//! impl Display for Error {
-//! #[remain::check]
-//! fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-//! use self::Error::*;
-//!
-//! #[sorted]
-//! match self {
-//! /* ... */
-//! # _ => unimplemented!(),
-//! }
-//! }
-//! }
-//! #
-//! # fn main() {}
-//! ```
-
-extern crate proc_macro;
-
-mod check;
-mod compare;
-mod emit;
-mod format;
-mod parse;
-mod visit;
-
-use proc_macro::TokenStream;
-use quote::quote;
-use syn::{parse_macro_input, ItemFn};
-
-use crate::emit::emit;
-use crate::parse::{Input, Nothing};
-
-#[proc_macro_attribute]
-pub fn sorted(args: TokenStream, input: TokenStream) -> TokenStream {
- let original = input.clone();
-
- let _ = parse_macro_input!(args as Nothing);
- let input = parse_macro_input!(input as Input);
- let kind = input.kind();
-
- match check::sorted(input) {
- Ok(()) => original,
- Err(err) => emit(err, kind, original),
- }
-}
-
-#[proc_macro_attribute]
-pub fn check(args: TokenStream, input: TokenStream) -> TokenStream {
- let _ = parse_macro_input!(args as Nothing);
- let mut input = parse_macro_input!(input as ItemFn);
-
- visit::check(&mut input);
-
- TokenStream::from(quote!(#input))
-}
diff --git a/0.1.3/src/parse.rs b/0.1.3/src/parse.rs
deleted file mode 100644
index 97bd9f8..0000000
--- a/0.1.3/src/parse.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use proc_macro2::Span;
-use syn::parse::{Parse, ParseStream};
-use syn::{Attribute, Error, Expr, Fields, Result, Stmt, Token, Visibility};
-
-use crate::emit::Kind;
-
-pub struct Nothing;
-
-impl Parse for Nothing {
- fn parse(_input: ParseStream) -> Result<Self> {
- Ok(Nothing)
- }
-}
-
-pub enum Input {
- Enum(syn::ItemEnum),
- Match(syn::ExprMatch),
- Struct(syn::FieldsNamed),
- Let(syn::ExprMatch),
-}
-
-impl Input {
- pub fn kind(&self) -> Kind {
- match self {
- Input::Enum(_) => Kind::Enum,
- Input::Match(_) => Kind::Match,
- Input::Struct(_) => Kind::Struct,
- Input::Let(_) => Kind::Let,
- }
- }
-}
-
-impl Parse for Input {
- fn parse(input: ParseStream) -> Result<Self> {
- let _ = input.call(Attribute::parse_outer)?;
-
- if input.peek(Token![match]) {
- let expr = match input.parse()? {
- Expr::Match(expr) => expr,
- _ => unreachable!("expected match"),
- };
- return Ok(Input::Match(expr));
- }
-
- if input.peek(Token![let]) {
- let stmt = match input.parse()? {
- Stmt::Local(stmt) => stmt,
- _ => unreachable!("expected let"),
- };
- let init = match stmt.init {
- Some((_, init)) => *init,
- None => return Err(unexpected()),
- };
- let expr = match init {
- Expr::Match(expr) => expr,
- _ => return Err(unexpected()),
- };
- return Ok(Input::Let(expr));
- }
-
- let ahead = input.fork();
- let _: Visibility = ahead.parse()?;
- if ahead.peek(Token![enum]) {
- return input.parse().map(Input::Enum);
- } else if ahead.peek(Token![struct]) {
- let input: syn::ItemStruct = input.parse()?;
- if let Fields::Named(fields) = input.fields {
- return Ok(Input::Struct(fields));
- }
- }
-
- Err(unexpected())
- }
-}
-
-fn unexpected() -> Error {
- let span = Span::call_site();
- let msg = "expected enum, struct, or match expression";
- Error::new(span, msg)
-}
diff --git a/0.1.3/src/visit.rs b/0.1.3/src/visit.rs
deleted file mode 100644
index f681aa9..0000000
--- a/0.1.3/src/visit.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use quote::quote;
-use syn::visit_mut::{self, VisitMut};
-use syn::{parse_quote, Attribute, Expr, ExprMatch, ItemFn, Local};
-
-use crate::parse::Input;
-
-pub fn check(input: &mut ItemFn) {
- Checker.visit_item_fn_mut(input);
-}
-
-struct Checker;
-
-impl VisitMut for Checker {
- fn visit_expr_mut(&mut self, expr: &mut Expr) {
- visit_mut::visit_expr_mut(self, expr);
-
- let expr_match = match expr {
- Expr::Match(expr) => expr,
- _ => return,
- };
-
- if !take_sorted_attr(&mut expr_match.attrs) {
- return;
- }
-
- let input = expr_match.clone();
- check_and_insert_error(input, expr);
- }
-
- fn visit_local_mut(&mut self, local: &mut Local) {
- visit_mut::visit_local_mut(self, local);
-
- let init = match &local.init {
- Some((_, init)) => init,
- None => return,
- };
-
- let expr_match = match init.as_ref() {
- Expr::Match(expr) => expr,
- _ => return,
- };
-
- if !take_sorted_attr(&mut local.attrs) {
- return;
- }
-
- let input = expr_match.clone();
- let expr = local.init.as_mut().unwrap().1.as_mut();
- check_and_insert_error(input, expr);
- }
-}
-
-fn take_sorted_attr(attrs: &mut Vec<Attribute>) -> bool {
- for i in 0..attrs.len() {
- let path = &attrs[i].path;
- let path = quote!(#path).to_string();
- if path == "sorted" || path == "remain :: sorted" {
- attrs.remove(i);
- return true;
- }
- }
-
- false
-}
-
-fn check_and_insert_error(input: ExprMatch, out: &mut Expr) {
- let original = quote!(#input);
- let input = Input::Match(input);
-
- if let Err(err) = crate::check::sorted(input) {
- let err = err.to_compile_error();
- *out = parse_quote!({
- #err
- #original
- });
- }
-}
diff --git a/0.1.3/tests/compiletest.rs b/0.1.3/tests/compiletest.rs
deleted file mode 100644
index 2e861bf..0000000
--- a/0.1.3/tests/compiletest.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#[rustc::attr(not(nightly), ignore)]
-#[test]
-fn ui() {
- let t = trybuild::TestCases::new();
- t.compile_fail("tests/ui/*.rs");
-}
diff --git a/0.1.3/tests/stable.rs b/0.1.3/tests/stable.rs
deleted file mode 100644
index a3b6a7b..0000000
--- a/0.1.3/tests/stable.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-#![allow(dead_code)]
-
-#[remain::sorted]
-pub enum TestEnum {
- A,
- B,
- C,
- D,
-}
-
-#[remain::sorted]
-pub struct TestStruct {
- a: usize,
- b: usize,
- c: usize,
- d: usize,
-}
-
-#[test]
-#[remain::check]
-fn test_match() {
- let value = TestEnum::A;
-
- #[sorted]
- let _ = match value {
- TestEnum::A => {}
- TestEnum::B => {}
- TestEnum::C => {}
- _ => {}
- };
-}
-
-#[test]
-#[remain::check]
-fn test_let() {
- let value = TestEnum::A;
-
- #[sorted]
- match value {
- TestEnum::A => {}
- TestEnum::B => {}
- TestEnum::C => {}
- _ => {}
- }
-}
diff --git a/0.1.3/tests/unstable.rs b/0.1.3/tests/unstable.rs
deleted file mode 100644
index 78dbd08..0000000
--- a/0.1.3/tests/unstable.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-#![allow(dead_code)]
-#![cfg(not(remain_stable_testing))]
-#![feature(proc_macro_hygiene, stmt_expr_attributes)]
-
-#[remain::sorted]
-pub enum TestEnum {
- A,
- B,
- C,
- D,
-}
-
-#[remain::sorted]
-pub struct TestStruct {
- a: usize,
- b: usize,
- c: usize,
- d: usize,
-}
-
-#[test]
-fn test_match() {
- let value = TestEnum::A;
-
- #[remain::sorted]
- let _ = match value {
- TestEnum::A => {}
- TestEnum::B => {}
- TestEnum::C => {}
- _ => {}
- };
-}
-
-#[test]
-fn test_let() {
- let value = TestEnum::A;
-
- #[remain::sorted]
- match value {
- TestEnum::A => {}
- TestEnum::B => {}
- TestEnum::C => {}
- _ => {}
- }
-}
diff --git a/0.2.1/.gitignore b/0.2.1/.gitignore
deleted file mode 100644
index 6936990..0000000
--- a/0.2.1/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-**/*.rs.bk
-Cargo.lock
diff --git a/0.2.1/LICENSE b/0.2.1/LICENSE
deleted file mode 120000
index 6b579aa..0000000
--- a/0.2.1/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE-APACHE
\ No newline at end of file
diff --git a/0.2.1/LICENSE-APACHE b/0.2.1/LICENSE-APACHE
deleted file mode 100644
index 16fe87b..0000000
--- a/0.2.1/LICENSE-APACHE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/0.2.1/LICENSE-MIT b/0.2.1/LICENSE-MIT
deleted file mode 100644
index 31aa793..0000000
--- a/0.2.1/LICENSE-MIT
+++ /dev/null
@@ -1,23 +0,0 @@
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/0.2.1/MODULE_LICENSE_APACHE2 b/0.2.1/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/0.2.1/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/0.2.1/NOTICE b/0.2.1/NOTICE
deleted file mode 120000
index 7a694c9..0000000
--- a/0.2.1/NOTICE
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE
\ No newline at end of file
diff --git a/0.2.1/src/format.rs b/0.2.1/src/format.rs
deleted file mode 100644
index 5832643..0000000
--- a/0.2.1/src/format.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use proc_macro2::TokenStream;
-use quote::TokenStreamExt;
-use std::fmt::{self, Display};
-use syn::Error;
-
-use crate::compare::Path;
-
-impl Display for Path {
- fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
- for (i, segment) in self.segments.iter().enumerate() {
- if i > 0 {
- formatter.write_str("::")?;
- }
- segment.fmt(formatter)?;
- }
- Ok(())
- }
-}
-
-pub fn error(lesser: &Path, greater: &Path) -> Error {
- let mut spans = TokenStream::new();
- spans.append_all(&lesser.segments);
-
- let msg = format!("{} should sort before {}", lesser, greater);
-
- Error::new_spanned(spans, msg)
-}
diff --git a/0.2.1/tests/ui/enum.rs b/0.2.1/tests/ui/enum.rs
deleted file mode 100644
index dc98475..0000000
--- a/0.2.1/tests/ui/enum.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use remain::sorted;
-
-#[sorted]
-enum E {
- Aaa,
- Ccc(u8),
- Ddd { u: u8 },
- Bbb(u8, u8),
-}
-
-fn main() {}
diff --git a/0.2.1/tests/ui/enum.stderr b/0.2.1/tests/ui/enum.stderr
deleted file mode 100644
index 50ffa8c..0000000
--- a/0.2.1/tests/ui/enum.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-error: Bbb should sort before Ccc
- --> $DIR/enum.rs:8:5
- |
-8 | Bbb(u8, u8),
- | ^^^
diff --git a/0.2.1/tests/ui/let-stable.rs b/0.2.1/tests/ui/let-stable.rs
deleted file mode 100644
index b05d3e3..0000000
--- a/0.2.1/tests/ui/let-stable.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-enum E {
- Aaa,
- Bbb(u8, u8),
- Ccc(u8),
- Ddd { u: u8 },
-}
-
-#[remain::check]
-fn main() {
- let value = E::Aaa;
-
- #[sorted]
- let _ = match value {
- E::Aaa => {}
- E::Ccc(_) => {}
- E::Ddd { u: _ } => {}
- E::Bbb(_, _) => {}
- };
-}
diff --git a/0.2.1/tests/ui/let-stable.stderr b/0.2.1/tests/ui/let-stable.stderr
deleted file mode 100644
index 9073750..0000000
--- a/0.2.1/tests/ui/let-stable.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-error: E::Bbb should sort before E::Ccc
- --> $DIR/let-stable.rs:17:9
- |
-17 | E::Bbb(_, _) => {}
- | ^^^^^^
diff --git a/0.2.1/tests/ui/let-unstable.rs b/0.2.1/tests/ui/let-unstable.rs
deleted file mode 100644
index 8d65c52..0000000
--- a/0.2.1/tests/ui/let-unstable.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-#![feature(proc_macro_hygiene, stmt_expr_attributes)]
-
-use remain::sorted;
-
-enum E {
- Aaa,
- Bbb(u8, u8),
- Ccc(u8),
- Ddd { u: u8 },
-}
-
-fn main() {
- let value = E::Aaa;
-
- #[sorted]
- let _ = match value {
- E::Aaa => {}
- E::Ccc(_) => {}
- E::Ddd { u: _ } => {}
- E::Bbb(_, _) => {}
- };
-}
diff --git a/0.2.1/tests/ui/let-unstable.stderr b/0.2.1/tests/ui/let-unstable.stderr
deleted file mode 100644
index 97c5ba1..0000000
--- a/0.2.1/tests/ui/let-unstable.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-error: E::Bbb should sort before E::Ccc
- --> $DIR/let-unstable.rs:15:5
- |
-15 | #[sorted]
- | ^^^^^^^^^
diff --git a/0.2.1/tests/ui/match-stable.rs b/0.2.1/tests/ui/match-stable.rs
deleted file mode 100644
index 6bdade4..0000000
--- a/0.2.1/tests/ui/match-stable.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-enum E {
- Aaa,
- Bbb(u8, u8),
- Ccc(u8),
- Ddd { u: u8 },
-}
-
-#[remain::check]
-fn main() {
- let value = E::Aaa;
-
- #[sorted]
- match value {
- E::Aaa => {}
- E::Ccc(_) => {}
- E::Ddd { u: _ } => {}
- E::Bbb(_, _) => {}
- }
-}
diff --git a/0.2.1/tests/ui/match-stable.stderr b/0.2.1/tests/ui/match-stable.stderr
deleted file mode 100644
index 183daa9..0000000
--- a/0.2.1/tests/ui/match-stable.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-error: E::Bbb should sort before E::Ccc
- --> $DIR/match-stable.rs:17:9
- |
-17 | E::Bbb(_, _) => {}
- | ^^^^^^
diff --git a/0.2.1/tests/ui/match-unstable.rs b/0.2.1/tests/ui/match-unstable.rs
deleted file mode 100644
index db047f1..0000000
--- a/0.2.1/tests/ui/match-unstable.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-#![feature(proc_macro_hygiene, stmt_expr_attributes)]
-
-use remain::sorted;
-
-enum E {
- Aaa,
- Bbb(u8, u8),
- Ccc(u8),
- Ddd { u: u8 },
-}
-
-fn main() {
- let value = E::Aaa;
-
- #[sorted]
- match value {
- E::Aaa => {}
- E::Ccc(_) => {}
- E::Ddd { u: _ } => {}
- E::Bbb(_, _) => {}
- }
-}
diff --git a/0.2.1/tests/ui/match-unstable.stderr b/0.2.1/tests/ui/match-unstable.stderr
deleted file mode 100644
index b2bdea0..0000000
--- a/0.2.1/tests/ui/match-unstable.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-error: E::Bbb should sort before E::Ccc
- --> $DIR/match-unstable.rs:15:5
- |
-15 | #[sorted]
- | ^^^^^^^^^
diff --git a/0.2.1/tests/ui/struct.rs b/0.2.1/tests/ui/struct.rs
deleted file mode 100644
index 5f2cd41..0000000
--- a/0.2.1/tests/ui/struct.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use remain::sorted;
-
-#[sorted]
-struct TestStruct {
- d: usize,
- c: usize,
- a: usize,
- b: usize,
-}
-
-fn main() {}
diff --git a/0.2.1/tests/ui/struct.stderr b/0.2.1/tests/ui/struct.stderr
deleted file mode 100644
index 2ead15b..0000000
--- a/0.2.1/tests/ui/struct.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-error: c should sort before d
- --> $DIR/struct.rs:6:5
- |
-6 | c: usize,
- | ^
diff --git a/0.2.1/tests/ui/unnamed-fields.rs b/0.2.1/tests/ui/unnamed-fields.rs
deleted file mode 100644
index 2fcfda9..0000000
--- a/0.2.1/tests/ui/unnamed-fields.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#[remain::sorted]
-struct TupleStruct(usize, usize, usize);
-
-#[remain::sorted]
-struct UnitStruct;
-
-fn main() {}
diff --git a/0.2.1/tests/ui/unnamed-fields.stderr b/0.2.1/tests/ui/unnamed-fields.stderr
deleted file mode 100644
index b7e28f5..0000000
--- a/0.2.1/tests/ui/unnamed-fields.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error: expected enum, struct, or match expression
- --> $DIR/unnamed-fields.rs:1:1
- |
-1 | #[remain::sorted]
- | ^^^^^^^^^^^^^^^^^
-
-error: expected enum, struct, or match expression
- --> $DIR/unnamed-fields.rs:4:1
- |
-4 | #[remain::sorted]
- | ^^^^^^^^^^^^^^^^^
diff --git a/0.2.1/tests/ui/unsupported.rs b/0.2.1/tests/ui/unsupported.rs
deleted file mode 100644
index b11c974..0000000
--- a/0.2.1/tests/ui/unsupported.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#[remain::check]
-fn main() {
- let value = 0;
-
- #[sorted]
- match value {
- 0..=20 => {}
- _ => {}
- }
-}
diff --git a/0.2.1/tests/ui/unsupported.stderr b/0.2.1/tests/ui/unsupported.stderr
deleted file mode 100644
index e471e1e..0000000
--- a/0.2.1/tests/ui/unsupported.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-error: unsupported by #[remain::sorted]
- --> $DIR/unsupported.rs:7:9
- |
-7 | 0..=20 => {}
- | ^^^^^^
diff --git a/0.2.1/Android.bp b/Android.bp
similarity index 100%
rename from 0.2.1/Android.bp
rename to Android.bp
diff --git a/0.2.1/Cargo.toml b/Cargo.toml
similarity index 100%
rename from 0.2.1/Cargo.toml
rename to Cargo.toml
diff --git a/0.2.1/Cargo.toml.orig b/Cargo.toml.orig
similarity index 100%
rename from 0.2.1/Cargo.toml.orig
rename to Cargo.toml.orig
diff --git a/0.1.3/LICENSE b/LICENSE
similarity index 100%
rename from 0.1.3/LICENSE
rename to LICENSE
diff --git a/0.1.3/LICENSE-APACHE b/LICENSE-APACHE
similarity index 100%
rename from 0.1.3/LICENSE-APACHE
rename to LICENSE-APACHE
diff --git a/0.1.3/LICENSE-MIT b/LICENSE-MIT
similarity index 100%
rename from 0.1.3/LICENSE-MIT
rename to LICENSE-MIT
diff --git a/0.2.1/METADATA b/METADATA
similarity index 100%
rename from 0.2.1/METADATA
rename to METADATA
diff --git a/0.1.3/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
similarity index 100%
rename from 0.1.3/MODULE_LICENSE_APACHE2
rename to MODULE_LICENSE_APACHE2
diff --git a/0.1.3/NOTICE b/NOTICE
similarity index 100%
rename from 0.1.3/NOTICE
rename to NOTICE
diff --git a/0.2.1/README.md b/README.md
similarity index 100%
rename from 0.2.1/README.md
rename to README.md
diff --git a/0.2.1/src/atom.rs b/src/atom.rs
similarity index 100%
rename from 0.2.1/src/atom.rs
rename to src/atom.rs
diff --git a/0.2.1/src/check.rs b/src/check.rs
similarity index 100%
rename from 0.2.1/src/check.rs
rename to src/check.rs
diff --git a/0.2.1/src/compare.rs b/src/compare.rs
similarity index 100%
rename from 0.2.1/src/compare.rs
rename to src/compare.rs
diff --git a/0.2.1/src/emit.rs b/src/emit.rs
similarity index 100%
rename from 0.2.1/src/emit.rs
rename to src/emit.rs
diff --git a/0.1.3/src/format.rs b/src/format.rs
similarity index 100%
rename from 0.1.3/src/format.rs
rename to src/format.rs
diff --git a/0.2.1/src/lib.rs b/src/lib.rs
similarity index 100%
rename from 0.2.1/src/lib.rs
rename to src/lib.rs
diff --git a/0.2.1/src/parse.rs b/src/parse.rs
similarity index 100%
rename from 0.2.1/src/parse.rs
rename to src/parse.rs
diff --git a/0.2.1/src/visit.rs b/src/visit.rs
similarity index 100%
rename from 0.2.1/src/visit.rs
rename to src/visit.rs
diff --git a/0.2.1/tests/compiletest.rs b/tests/compiletest.rs
similarity index 100%
rename from 0.2.1/tests/compiletest.rs
rename to tests/compiletest.rs
diff --git a/0.2.1/tests/order.rs b/tests/order.rs
similarity index 100%
rename from 0.2.1/tests/order.rs
rename to tests/order.rs
diff --git a/0.2.1/tests/stable.rs b/tests/stable.rs
similarity index 100%
rename from 0.2.1/tests/stable.rs
rename to tests/stable.rs
diff --git a/0.1.3/tests/ui/enum.rs b/tests/ui/enum.rs
similarity index 100%
rename from 0.1.3/tests/ui/enum.rs
rename to tests/ui/enum.rs
diff --git a/0.1.3/tests/ui/enum.stderr b/tests/ui/enum.stderr
similarity index 100%
rename from 0.1.3/tests/ui/enum.stderr
rename to tests/ui/enum.stderr
diff --git a/0.1.3/tests/ui/let-stable.rs b/tests/ui/let-stable.rs
similarity index 100%
rename from 0.1.3/tests/ui/let-stable.rs
rename to tests/ui/let-stable.rs
diff --git a/0.1.3/tests/ui/let-stable.stderr b/tests/ui/let-stable.stderr
similarity index 100%
rename from 0.1.3/tests/ui/let-stable.stderr
rename to tests/ui/let-stable.stderr
diff --git a/0.1.3/tests/ui/let-unstable.rs b/tests/ui/let-unstable.rs
similarity index 100%
rename from 0.1.3/tests/ui/let-unstable.rs
rename to tests/ui/let-unstable.rs
diff --git a/0.1.3/tests/ui/let-unstable.stderr b/tests/ui/let-unstable.stderr
similarity index 100%
rename from 0.1.3/tests/ui/let-unstable.stderr
rename to tests/ui/let-unstable.stderr
diff --git a/0.1.3/tests/ui/match-stable.rs b/tests/ui/match-stable.rs
similarity index 100%
rename from 0.1.3/tests/ui/match-stable.rs
rename to tests/ui/match-stable.rs
diff --git a/0.1.3/tests/ui/match-stable.stderr b/tests/ui/match-stable.stderr
similarity index 100%
rename from 0.1.3/tests/ui/match-stable.stderr
rename to tests/ui/match-stable.stderr
diff --git a/0.1.3/tests/ui/match-unstable.rs b/tests/ui/match-unstable.rs
similarity index 100%
rename from 0.1.3/tests/ui/match-unstable.rs
rename to tests/ui/match-unstable.rs
diff --git a/0.1.3/tests/ui/match-unstable.stderr b/tests/ui/match-unstable.stderr
similarity index 100%
rename from 0.1.3/tests/ui/match-unstable.stderr
rename to tests/ui/match-unstable.stderr
diff --git a/0.2.1/tests/ui/repeat.rs b/tests/ui/repeat.rs
similarity index 100%
rename from 0.2.1/tests/ui/repeat.rs
rename to tests/ui/repeat.rs
diff --git a/0.2.1/tests/ui/repeat.stderr b/tests/ui/repeat.stderr
similarity index 100%
rename from 0.2.1/tests/ui/repeat.stderr
rename to tests/ui/repeat.stderr
diff --git a/0.1.3/tests/ui/struct.rs b/tests/ui/struct.rs
similarity index 100%
rename from 0.1.3/tests/ui/struct.rs
rename to tests/ui/struct.rs
diff --git a/0.1.3/tests/ui/struct.stderr b/tests/ui/struct.stderr
similarity index 100%
rename from 0.1.3/tests/ui/struct.stderr
rename to tests/ui/struct.stderr
diff --git a/0.1.3/tests/ui/unnamed-fields.rs b/tests/ui/unnamed-fields.rs
similarity index 100%
rename from 0.1.3/tests/ui/unnamed-fields.rs
rename to tests/ui/unnamed-fields.rs
diff --git a/0.1.3/tests/ui/unnamed-fields.stderr b/tests/ui/unnamed-fields.stderr
similarity index 100%
rename from 0.1.3/tests/ui/unnamed-fields.stderr
rename to tests/ui/unnamed-fields.stderr
diff --git a/0.2.1/tests/ui/unsorted-enum.rs b/tests/ui/unsorted-enum.rs
similarity index 100%
rename from 0.2.1/tests/ui/unsorted-enum.rs
rename to tests/ui/unsorted-enum.rs
diff --git a/0.2.1/tests/ui/unsorted-enum.stderr b/tests/ui/unsorted-enum.stderr
similarity index 100%
rename from 0.2.1/tests/ui/unsorted-enum.stderr
rename to tests/ui/unsorted-enum.stderr
diff --git a/0.2.1/tests/ui/unsorted-match-stable.rs b/tests/ui/unsorted-match-stable.rs
similarity index 100%
rename from 0.2.1/tests/ui/unsorted-match-stable.rs
rename to tests/ui/unsorted-match-stable.rs
diff --git a/0.2.1/tests/ui/unsorted-match-stable.stderr b/tests/ui/unsorted-match-stable.stderr
similarity index 100%
rename from 0.2.1/tests/ui/unsorted-match-stable.stderr
rename to tests/ui/unsorted-match-stable.stderr
diff --git a/0.2.1/tests/ui/unsorted-match-unstable.rs b/tests/ui/unsorted-match-unstable.rs
similarity index 100%
rename from 0.2.1/tests/ui/unsorted-match-unstable.rs
rename to tests/ui/unsorted-match-unstable.rs
diff --git a/0.2.1/tests/ui/unsorted-match-unstable.stderr b/tests/ui/unsorted-match-unstable.stderr
similarity index 100%
rename from 0.2.1/tests/ui/unsorted-match-unstable.stderr
rename to tests/ui/unsorted-match-unstable.stderr
diff --git a/0.2.1/tests/ui/unsorted-struct.rs b/tests/ui/unsorted-struct.rs
similarity index 100%
rename from 0.2.1/tests/ui/unsorted-struct.rs
rename to tests/ui/unsorted-struct.rs
diff --git a/0.2.1/tests/ui/unsorted-struct.stderr b/tests/ui/unsorted-struct.stderr
similarity index 100%
rename from 0.2.1/tests/ui/unsorted-struct.stderr
rename to tests/ui/unsorted-struct.stderr
diff --git a/0.1.3/tests/ui/unsupported.rs b/tests/ui/unsupported.rs
similarity index 100%
rename from 0.1.3/tests/ui/unsupported.rs
rename to tests/ui/unsupported.rs
diff --git a/0.1.3/tests/ui/unsupported.stderr b/tests/ui/unsupported.stderr
similarity index 100%
rename from 0.1.3/tests/ui/unsupported.stderr
rename to tests/ui/unsupported.stderr
diff --git a/0.2.1/tests/unstable.rs b/tests/unstable.rs
similarity index 100%
rename from 0.2.1/tests/unstable.rs
rename to tests/unstable.rs