Skip to content

Commit 4b947c4

Browse files
committed
Merge pull request servo#58 from metajack/cargoify
Change directory structure to be more idiomatic.
2 parents 48e517b + 472c1bd commit 4b947c4

27 files changed

+4
-5
lines changed

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]
77
[[lib]]
88

99
name = "cssparser"
10-
path = "lib.rs"
1110

1211
[dependencies.encoding]
1312

Makefile.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ RUSTDOC ?= rustdoc
1111
RUSTDOC_FLAGS ?=
1212
RUSTDOC_TARGET ?= doc
1313

14-
RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs')
14+
RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
1515

1616
.PHONY: all
1717
all: libcssparser.dummy
1818

19-
libcssparser.dummy: lib.rs $(RUST_SRC) $(EXT_DEPS)
19+
libcssparser.dummy: src/lib.rs $(RUST_SRC) $(EXT_DEPS)
2020
$(RUSTC) $(RUSTFLAGS) $< --out-dir .
2121
touch $@
2222

23-
cssparser-test: lib.rs $(RUST_SRC)
23+
cssparser-test: src/lib.rs $(RUST_SRC)
2424
$(RUSTC) $(RUSTFLAGS) $< -o $@ --test
2525

2626
.PHONY: check
@@ -34,7 +34,7 @@ check-debug: cssparser-tests
3434
.PHONY: doc
3535
doc: $(RUSTDOC_TARGET)/cssparser/index.html
3636

37-
$(RUSTDOC_TARGET)/cssparser/index.html: lib.rs $(RUST_SRC) $(EXT_DEPS)
37+
$(RUSTDOC_TARGET)/cssparser/index.html: src/lib.rs $(RUST_SRC) $(EXT_DEPS)
3838
$(RUSTDOC) $(RUSTDOC_FLAGS) $< -o $(RUSTDOC_TARGET)
3939

4040
.PHONY: clean

ast.rs renamed to src/ast.rs

File renamed without changes.

color.rs renamed to src/color.rs

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

lib.rs renamed to src/lib.rs

File renamed without changes.

nth.rs renamed to src/nth.rs

File renamed without changes.

parser.rs renamed to src/parser.rs

File renamed without changes.
File renamed without changes.

tests.rs renamed to src/tests.rs

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)