Skip to content

Commit 84653f3

Browse files
committed
---
yaml --- r: 111983 b: refs/heads/auto c: 2216001 h: refs/heads/master i: 111981: 0c99582 111979: 3764019 111975: e530e4e 111967: 9156db5 v: v3
1 parent d9a7a25 commit 84653f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+380
-11384
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 6c3bdbe2e45739a5396316392ae3eb8c1d7a7434
16+
refs/heads/auto: 22160014a4195f12dcef70e800de2ffc2cc7a981
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/mk/crates.mk

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151

5252
TARGET_CRATES := libc std green rustuv native flate arena glob term semver \
5353
uuid serialize sync getopts collections num test time rand \
54-
workcache url log regex
55-
HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros
54+
workcache url log
55+
HOST_CRATES := syntax rustc rustdoc fourcc hexfloat
5656
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5757
TOOLS := compiletest rustdoc rustc
5858

@@ -84,8 +84,6 @@ DEPS_rand := std
8484
DEPS_url := std collections
8585
DEPS_workcache := std serialize collections log
8686
DEPS_log := std sync
87-
DEPS_regex := std collections
88-
DEPS_regex_macros = syntax std regex
8987

9088
TOOL_DEPS_compiletest := test green rustuv getopts
9189
TOOL_DEPS_rustdoc := rustdoc native

branches/auto/mk/main.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,8 @@ HSREQ$(1)_H_$(3) = $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3))
311311
else
312312
HSREQ$(1)_H_$(3) = \
313313
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
314+
$$(HLIB$(1)_H_$(3))/stamp.rustc \
315+
$$(foreach dep,$$(RUST_DEPS_rustc),$$(HLIB$(1)_H_$(3))/stamp.$$(dep)) \
314316
$$(MKFILE_DEPS)
315317
endif
316318

@@ -332,7 +334,8 @@ SREQ$(1)_T_$(2)_H_$(3) = \
332334
CSREQ$(1)_T_$(2)_H_$(3) = \
333335
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
334336
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
335-
$$(foreach dep,$$(CRATES),$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep))
337+
$$(foreach dep,$$(CRATES),$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep)) \
338+
$$(foreach dep,$$(HOST_CRATES),$$(HLIB$(1)_H_$(3))/stamp.$$(dep))
336339

337340
ifeq ($(1),0)
338341
# Don't run the stage0 compiler under valgrind - that ship has sailed

branches/auto/src/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Source layout:
1919
| `libfourcc/` | Data format identifier library |
2020
| `libgetopts/` | Get command-line-options library |
2121
| `libglob/` | Unix glob patterns library |
22-
| `libregex/` | Regular expressions |
2322
| `libsemver/` | Rust's semantic versioning library |
2423
| `libserialize/` | Encode-Decode types library |
2524
| `libsync/` | Concurrency mechanisms and primitives |

branches/auto/src/doc/favicon.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<link rel="shortcut icon" href="http://www.rust-lang.org/favicon.ico" />
1+
<link rel="shortcut icon" href="http://www.rust-lang.org/favicon.ico">

branches/auto/src/doc/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ li {list-style-type: none; }
4141
* [The `native` 1:1 threading runtime](native/index.html)
4242
* [The `num` arbitrary precision numerics library](num/index.html)
4343
* [The `rand` library for random numbers and distributions](rand/index.html)
44-
* [The `regex` library for regular expressions](regex/index.html)
4544
* [The `rustc` compiler](rustc/index.html)
4645
* [The `rustuv` M:N I/O library](rustuv/index.html)
4746
* [The `semver` version collation library](semver/index.html)

branches/auto/src/doc/intro.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ a `Sender` and `Receiver` (commonly abbreviated `tx` and `rx`).
217217
The `spawn` function spins up a new task,
218218
given a *heap allocated closure* to run.
219219
As you can see in the code,
220-
we call `tx.send()` from the original task,
220+
we call `chan.send()` from the original task,
221221
passing in our boxed array,
222222
and we call `rx.recv()` (short for 'receive') inside of the new task:
223223
values given to the `Sender` via the `send` method come out the other end via the `recv` method on the `Receiver`.

branches/auto/src/etc/regex-match-tests.py

Lines changed: 0 additions & 109 deletions
This file was deleted.

branches/auto/src/etc/regex-unicode-tables.py

Lines changed: 0 additions & 183 deletions
This file was deleted.

0 commit comments

Comments
 (0)