From 472c1bd39edeff79bdff2950053963d8052645d6 Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Thu, 14 Aug 2014 16:51:48 -0600 Subject: [PATCH] Change directory structure to be more idiomatic. --- Cargo.toml | 1 - Makefile.in | 8 ++++---- ast.rs => src/ast.rs | 0 color.rs => src/color.rs | 0 {css-parsing-tests => src/css-parsing-tests}/An+B.json | 0 {css-parsing-tests => src/css-parsing-tests}/LICENSE | 0 {css-parsing-tests => src/css-parsing-tests}/README.rst | 0 {css-parsing-tests => src/css-parsing-tests}/color3.json | 0 .../css-parsing-tests}/color3_hsl.json | 0 .../css-parsing-tests}/color3_keywords.json | 0 .../css-parsing-tests}/component_value_list.json | 0 .../css-parsing-tests}/declaration_list.json | 0 .../css-parsing-tests}/make_color3_hsl.py | 0 .../css-parsing-tests}/make_color3_keywords.py | 0 .../css-parsing-tests}/one_component_value.json | 0 .../css-parsing-tests}/one_declaration.json | 0 .../css-parsing-tests}/one_rule.json | 0 .../css-parsing-tests}/rule_list.json | 0 .../css-parsing-tests}/stylesheet.json | 0 .../css-parsing-tests}/stylesheet_bytes.json | 0 from_bytes.rs => src/from_bytes.rs | 0 lib.rs => src/lib.rs | 0 nth.rs => src/nth.rs | 0 parser.rs => src/parser.rs | 0 serializer.rs => src/serializer.rs | 0 tests.rs => src/tests.rs | 0 tokenizer.rs => src/tokenizer.rs | 0 27 files changed, 4 insertions(+), 5 deletions(-) rename ast.rs => src/ast.rs (100%) rename color.rs => src/color.rs (100%) rename {css-parsing-tests => src/css-parsing-tests}/An+B.json (100%) rename {css-parsing-tests => src/css-parsing-tests}/LICENSE (100%) rename {css-parsing-tests => src/css-parsing-tests}/README.rst (100%) rename {css-parsing-tests => src/css-parsing-tests}/color3.json (100%) rename {css-parsing-tests => src/css-parsing-tests}/color3_hsl.json (100%) rename {css-parsing-tests => src/css-parsing-tests}/color3_keywords.json (100%) rename {css-parsing-tests => src/css-parsing-tests}/component_value_list.json (100%) rename {css-parsing-tests => src/css-parsing-tests}/declaration_list.json (100%) rename {css-parsing-tests => src/css-parsing-tests}/make_color3_hsl.py (100%) rename {css-parsing-tests => src/css-parsing-tests}/make_color3_keywords.py (100%) rename {css-parsing-tests => src/css-parsing-tests}/one_component_value.json (100%) rename {css-parsing-tests => src/css-parsing-tests}/one_declaration.json (100%) rename {css-parsing-tests => src/css-parsing-tests}/one_rule.json (100%) rename {css-parsing-tests => src/css-parsing-tests}/rule_list.json (100%) rename {css-parsing-tests => src/css-parsing-tests}/stylesheet.json (100%) rename {css-parsing-tests => src/css-parsing-tests}/stylesheet_bytes.json (100%) rename from_bytes.rs => src/from_bytes.rs (100%) rename lib.rs => src/lib.rs (100%) rename nth.rs => src/nth.rs (100%) rename parser.rs => src/parser.rs (100%) rename serializer.rs => src/serializer.rs (100%) rename tests.rs => src/tests.rs (100%) rename tokenizer.rs => src/tokenizer.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index eda448b4..9633ef98 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,6 @@ authors = [ "Simon Sapin " ] [[lib]] name = "cssparser" -path = "lib.rs" [dependencies.encoding] diff --git a/Makefile.in b/Makefile.in index 6f3c999e..30376940 100644 --- a/Makefile.in +++ b/Makefile.in @@ -11,16 +11,16 @@ RUSTDOC ?= rustdoc RUSTDOC_FLAGS ?= RUSTDOC_TARGET ?= doc -RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs') +RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs') .PHONY: all all: libcssparser.dummy -libcssparser.dummy: lib.rs $(RUST_SRC) $(EXT_DEPS) +libcssparser.dummy: src/lib.rs $(RUST_SRC) $(EXT_DEPS) $(RUSTC) $(RUSTFLAGS) $< --out-dir . touch $@ -cssparser-test: lib.rs $(RUST_SRC) +cssparser-test: src/lib.rs $(RUST_SRC) $(RUSTC) $(RUSTFLAGS) $< -o $@ --test .PHONY: check @@ -34,7 +34,7 @@ check-debug: cssparser-tests .PHONY: doc doc: $(RUSTDOC_TARGET)/cssparser/index.html -$(RUSTDOC_TARGET)/cssparser/index.html: lib.rs $(RUST_SRC) $(EXT_DEPS) +$(RUSTDOC_TARGET)/cssparser/index.html: src/lib.rs $(RUST_SRC) $(EXT_DEPS) $(RUSTDOC) $(RUSTDOC_FLAGS) $< -o $(RUSTDOC_TARGET) .PHONY: clean diff --git a/ast.rs b/src/ast.rs similarity index 100% rename from ast.rs rename to src/ast.rs diff --git a/color.rs b/src/color.rs similarity index 100% rename from color.rs rename to src/color.rs diff --git a/css-parsing-tests/An+B.json b/src/css-parsing-tests/An+B.json similarity index 100% rename from css-parsing-tests/An+B.json rename to src/css-parsing-tests/An+B.json diff --git a/css-parsing-tests/LICENSE b/src/css-parsing-tests/LICENSE similarity index 100% rename from css-parsing-tests/LICENSE rename to src/css-parsing-tests/LICENSE diff --git a/css-parsing-tests/README.rst b/src/css-parsing-tests/README.rst similarity index 100% rename from css-parsing-tests/README.rst rename to src/css-parsing-tests/README.rst diff --git a/css-parsing-tests/color3.json b/src/css-parsing-tests/color3.json similarity index 100% rename from css-parsing-tests/color3.json rename to src/css-parsing-tests/color3.json diff --git a/css-parsing-tests/color3_hsl.json b/src/css-parsing-tests/color3_hsl.json similarity index 100% rename from css-parsing-tests/color3_hsl.json rename to src/css-parsing-tests/color3_hsl.json diff --git a/css-parsing-tests/color3_keywords.json b/src/css-parsing-tests/color3_keywords.json similarity index 100% rename from css-parsing-tests/color3_keywords.json rename to src/css-parsing-tests/color3_keywords.json diff --git a/css-parsing-tests/component_value_list.json b/src/css-parsing-tests/component_value_list.json similarity index 100% rename from css-parsing-tests/component_value_list.json rename to src/css-parsing-tests/component_value_list.json diff --git a/css-parsing-tests/declaration_list.json b/src/css-parsing-tests/declaration_list.json similarity index 100% rename from css-parsing-tests/declaration_list.json rename to src/css-parsing-tests/declaration_list.json diff --git a/css-parsing-tests/make_color3_hsl.py b/src/css-parsing-tests/make_color3_hsl.py similarity index 100% rename from css-parsing-tests/make_color3_hsl.py rename to src/css-parsing-tests/make_color3_hsl.py diff --git a/css-parsing-tests/make_color3_keywords.py b/src/css-parsing-tests/make_color3_keywords.py similarity index 100% rename from css-parsing-tests/make_color3_keywords.py rename to src/css-parsing-tests/make_color3_keywords.py diff --git a/css-parsing-tests/one_component_value.json b/src/css-parsing-tests/one_component_value.json similarity index 100% rename from css-parsing-tests/one_component_value.json rename to src/css-parsing-tests/one_component_value.json diff --git a/css-parsing-tests/one_declaration.json b/src/css-parsing-tests/one_declaration.json similarity index 100% rename from css-parsing-tests/one_declaration.json rename to src/css-parsing-tests/one_declaration.json diff --git a/css-parsing-tests/one_rule.json b/src/css-parsing-tests/one_rule.json similarity index 100% rename from css-parsing-tests/one_rule.json rename to src/css-parsing-tests/one_rule.json diff --git a/css-parsing-tests/rule_list.json b/src/css-parsing-tests/rule_list.json similarity index 100% rename from css-parsing-tests/rule_list.json rename to src/css-parsing-tests/rule_list.json diff --git a/css-parsing-tests/stylesheet.json b/src/css-parsing-tests/stylesheet.json similarity index 100% rename from css-parsing-tests/stylesheet.json rename to src/css-parsing-tests/stylesheet.json diff --git a/css-parsing-tests/stylesheet_bytes.json b/src/css-parsing-tests/stylesheet_bytes.json similarity index 100% rename from css-parsing-tests/stylesheet_bytes.json rename to src/css-parsing-tests/stylesheet_bytes.json diff --git a/from_bytes.rs b/src/from_bytes.rs similarity index 100% rename from from_bytes.rs rename to src/from_bytes.rs diff --git a/lib.rs b/src/lib.rs similarity index 100% rename from lib.rs rename to src/lib.rs diff --git a/nth.rs b/src/nth.rs similarity index 100% rename from nth.rs rename to src/nth.rs diff --git a/parser.rs b/src/parser.rs similarity index 100% rename from parser.rs rename to src/parser.rs diff --git a/serializer.rs b/src/serializer.rs similarity index 100% rename from serializer.rs rename to src/serializer.rs diff --git a/tests.rs b/src/tests.rs similarity index 100% rename from tests.rs rename to src/tests.rs diff --git a/tokenizer.rs b/src/tokenizer.rs similarity index 100% rename from tokenizer.rs rename to src/tokenizer.rs