Skip to content

Commit a5fe77e

Browse files
committed
---
yaml --- r: 179679 b: refs/heads/auto c: 00d1873 h: refs/heads/master i: 179677: 6f7aa86 179675: 76484c8 179671: 5d7d293 179663: 62603a1 179647: 426e6ed v: v3
1 parent d4ee4c0 commit a5fe77e

File tree

524 files changed

+3885
-8109
lines changed

Some content is hidden

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

524 files changed

+3885
-8109
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 8ee86860bc1a16b24aa4c61ef6dee8967c521e1a
13+
refs/heads/auto: 00d1873c4729f1e8c109b64a7eeb87877f075279
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/Makefile.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@
5959
# * check-stage$(stage)-$(crate) - Test a crate in a specific stage
6060
# * check-stage$(stage)-{rpass,rfail,cfail,rmake,...} - Run tests in src/test/
6161
# * check-stage1-T-$(target)-H-$(host) - Run cross-compiled-tests
62-
# * tidy-basic - show file / line stats
63-
# * tidy-errors - show the highest rustc error code
64-
# * tidy-features - show the status of language and lib features
6562
#
6663
# Then mix in some of these environment variables to harness the
6764
# ultimate power of The Rust Build System.

branches/auto/configure

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,9 @@ probe CFG_GRUN grun
653653
probe CFG_FLEX flex
654654
probe CFG_BISON bison
655655
probe CFG_PANDOC pandoc
656+
probe CFG_PDFLATEX pdflatex
656657
probe CFG_XELATEX xelatex
658+
probe CFG_LUALATEX lualatex
657659
probe CFG_GDB gdb
658660
probe CFG_LLDB lldb
659661

branches/auto/mk/docs.mk

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,27 @@ else
8585
HTML_DEPS :=
8686
endif
8787

88-
# Check for xelatex
89-
90-
ifeq ($(CFG_XELATEX),)
88+
# Check for the various external utilities for the EPUB/PDF docs:
89+
90+
ifeq ($(CFG_LUALATEX),)
91+
$(info cfg: no lualatex found, deferring to xelatex)
92+
ifeq ($(CFG_XELATEX),)
93+
$(info cfg: no xelatex found, deferring to pdflatex)
94+
ifeq ($(CFG_PDFLATEX),)
95+
$(info cfg: no pdflatex found, disabling LaTeX docs)
96+
NO_PDF_DOCS = 1
97+
else
98+
CFG_LATEX := $(CFG_PDFLATEX)
99+
endif
100+
else
91101
CFG_LATEX := $(CFG_XELATEX)
92102
XELATEX = 1
93-
else
94-
$(info cfg: no xelatex found, disabling LaTeX docs)
95-
NO_PDF_DOCS = 1
103+
endif
104+
else
105+
CFG_LATEX := $(CFG_LUALATEX)
96106
endif
97107

108+
98109
ifeq ($(CFG_PANDOC),)
99110
$(info cfg: no pandoc found, omitting PDF and EPUB docs)
100111
ONLY_HTML_DOCS = 1

branches/auto/mk/main.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ endif
7272
# numbers and dots here
7373
CFG_VERSION_WIN = $(CFG_RELEASE_NUM)
7474

75-
CFG_INFO := $(info cfg: version $(CFG_VERSION))
7675

7776
######################################################################
7877
# More configuration
@@ -180,7 +179,6 @@ endif
180179

181180
ifndef CFG_DISABLE_VALGRIND_RPASS
182181
$(info cfg: enabling valgrind run-pass tests (CFG_ENABLE_VALGRIND_RPASS))
183-
$(info cfg: valgrind-rpass command set to $(CFG_VALGRIND))
184182
CFG_VALGRIND_RPASS :=$(CFG_VALGRIND)
185183
else
186184
CFG_VALGRIND_RPASS :=

branches/auto/mk/tests.mk

Lines changed: 52 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ $(foreach file,$(wildcard $(S)src/doc/trpl/*.md), \
162162
######################################################################
163163

164164
# The main testing target. Tests lots of stuff.
165-
check: cleantmptestlogs cleantestlibs all check-stage2 tidy
166-
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
165+
check: cleantmptestlogs cleantestlibs check-notidy tidy
167166

168167
# As above but don't bother running tidy.
169168
check-notidy: cleantmptestlogs cleantestlibs all check-stage2
@@ -236,24 +235,57 @@ cleantestlibs:
236235
######################################################################
237236

238237
ifdef CFG_NOTIDY
239-
.PHONY: tidy
240238
tidy:
241239
else
242240

243-
# Run the tidy script in multiple parts to avoid huge 'echo' commands
244-
.PHONY: tidy
245-
tidy: tidy-basic tidy-binaries tidy-errors tidy-features
246-
247-
endif
241+
ALL_CS := $(wildcard $(S)src/rt/*.cpp \
242+
$(S)src/rt/*/*.cpp \
243+
$(S)src/rt/*/*/*.cpp \
244+
$(S)src/rustllvm/*.cpp)
245+
ALL_CS := $(filter-out $(S)src/rt/miniz.cpp \
246+
$(wildcard $(S)src/rt/hoedown/src/*.c) \
247+
$(wildcard $(S)src/rt/hoedown/bin/*.c) \
248+
,$(ALL_CS))
249+
ALL_HS := $(wildcard $(S)src/rt/*.h \
250+
$(S)src/rt/*/*.h \
251+
$(S)src/rt/*/*/*.h \
252+
$(S)src/rustllvm/*.h)
253+
ALL_HS := $(filter-out $(S)src/rt/valgrind/valgrind.h \
254+
$(S)src/rt/valgrind/memcheck.h \
255+
$(S)src/rt/msvc/typeof.h \
256+
$(S)src/rt/msvc/stdint.h \
257+
$(S)src/rt/msvc/inttypes.h \
258+
$(wildcard $(S)src/rt/hoedown/src/*.h) \
259+
$(wildcard $(S)src/rt/hoedown/bin/*.h) \
260+
,$(ALL_HS))
248261

249-
.PHONY: tidy-basic
250-
tidy-basic:
262+
# Run the tidy script in multiple parts to avoid huge 'echo' commands
263+
tidy:
251264
@$(call E, check: formatting)
252-
$(Q) $(CFG_PYTHON) $(S)src/etc/tidy.py $(S)src/
253-
254-
.PHONY: tidy-binaries
255-
tidy-binaries:
256-
@$(call E, check: binaries)
265+
$(Q)find $(S)src -name '*.r[sc]' \
266+
-and -not -regex '^$(S)src/jemalloc.*' \
267+
-and -not -regex '^$(S)src/libuv.*' \
268+
-and -not -regex '^$(S)src/llvm.*' \
269+
-and -not -regex '^$(S)src/gyp.*' \
270+
-and -not -regex '^$(S)src/libbacktrace.*' \
271+
-print0 \
272+
| xargs -0 -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
273+
$(Q)find $(S)src/etc -name '*.py' \
274+
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
275+
$(Q)find $(S)src/doc -name '*.js' \
276+
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
277+
$(Q)find $(S)src/etc -name '*.sh' \
278+
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
279+
$(Q)find $(S)src/etc -name '*.pl' \
280+
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
281+
$(Q)find $(S)src/etc -name '*.c' \
282+
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
283+
$(Q)find $(S)src/etc -name '*.h' \
284+
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
285+
$(Q)echo $(ALL_CS) \
286+
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
287+
$(Q)echo $(ALL_HS) \
288+
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
257289
$(Q)find $(S)src -type f -perm +a+x \
258290
-not -name '*.rs' -and -not -name '*.py' \
259291
-and -not -name '*.sh' \
@@ -268,18 +300,13 @@ tidy-binaries:
268300
| grep '^$(S)src/libbacktrace' -v \
269301
| grep '^$(S)src/rust-installer' -v \
270302
| xargs $(CFG_PYTHON) $(S)src/etc/check-binaries.py
271-
272-
.PHONY: tidy-errors
273-
tidy-errors:
274-
@$(call E, check: extended errors)
275303
$(Q) $(CFG_PYTHON) $(S)src/etc/errorck.py $(S)src/
276-
277-
.PHONY: tidy-features
278-
tidy-features:
279-
@$(call E, check: feature sanity)
280304
$(Q) $(CFG_PYTHON) $(S)src/etc/featureck.py $(S)src/
281305

282306

307+
endif
308+
309+
283310
######################################################################
284311
# Sets of tests
285312
######################################################################
@@ -452,7 +479,6 @@ RPASS_FULL_RS := $(wildcard $(S)src/test/run-pass-fulldeps/*.rs)
452479
CFAIL_FULL_RS := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rs)
453480
RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
454481
CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
455-
PFAIL_RS := $(wildcard $(S)src/test/parse-fail/*.rs)
456482
BENCH_RS := $(wildcard $(S)src/test/bench/*.rs)
457483
PRETTY_RS := $(wildcard $(S)src/test/pretty/*.rs)
458484
DEBUGINFO_GDB_RS := $(wildcard $(S)src/test/debuginfo/*.rs)
@@ -469,7 +495,7 @@ RPASS_VALGRIND_TESTS := $(RPASS_VALGRIND_RS)
469495
RPASS_FULL_TESTS := $(RPASS_FULL_RS)
470496
CFAIL_FULL_TESTS := $(CFAIL_FULL_RS)
471497
RFAIL_TESTS := $(RFAIL_RS)
472-
CFAIL_TESTS := $(CFAIL_RS) $(PFAIL_RS)
498+
CFAIL_TESTS := $(CFAIL_RS)
473499
BENCH_TESTS := $(BENCH_RS)
474500
PERF_TESTS := $(PERF_RS)
475501
PRETTY_TESTS := $(PRETTY_RS)
@@ -613,6 +639,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
613639

614640
ifdef CFG_VALGRIND_RPASS
615641
ifdef GOOD_VALGRIND_$(2)
642+
$(info cfg: valgrind-path set to $(CFG_VALGRIND_RPASS))
616643
CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) += --valgrind-path "$(CFG_VALGRIND_RPASS)"
617644
endif
618645
endif

branches/auto/src/compiletest/compiletest.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,7 @@ pub fn parse_config(args: Vec<String> ) -> Config {
118118
}
119119

120120
fn opt_path(m: &getopts::Matches, nm: &str) -> Path {
121-
match m.opt_str(nm) {
122-
Some(s) => Path::new(s),
123-
None => panic!("no option (=path) found for {}", nm),
124-
}
121+
Path::new(m.opt_str(nm).unwrap())
125122
}
126123

127124
let filter = if !matches.free.is_empty() {

branches/auto/src/doc/reference.md

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -256,11 +256,11 @@ cases mentioned in [Number literals](#number-literals) below.
256256

257257
| [Number literals](#number-literals)`*` | Example | Exponentiation | Suffixes |
258258
|----------------------------------------|---------|----------------|----------|
259-
| Decimal integer | `98_222` | `N/A` | Integer suffixes |
260-
| Hex integer | `0xff` | `N/A` | Integer suffixes |
261-
| Octal integer | `0o77` | `N/A` | Integer suffixes |
262-
| Binary integer | `0b1111_0000` | `N/A` | Integer suffixes |
263-
| Floating-point | `123.0E+77` | `Optional` | Floating-point suffixes |
259+
| Decimal integer | `98_222is` | `N/A` | Integer suffixes |
260+
| Hex integer | `0xffis` | `N/A` | Integer suffixes |
261+
| Octal integer | `0o77is` | `N/A` | Integer suffixes |
262+
| Binary integer | `0b1111_0000is` | `N/A` | Integer suffixes |
263+
| Floating-point | `123.0E+77f64` | `Optional` | Floating-point suffixes |
264264

265265
`*` All number literals allow `_` as a visual separator: `1_234.0E+18f64`
266266

@@ -1813,6 +1813,7 @@ default visibility with the `priv` keyword. When an item is declared as `pub`,
18131813
it can be thought of as being accessible to the outside world. For example:
18141814

18151815
```
1816+
# #![allow(missing_copy_implementations)]
18161817
# fn main() {}
18171818
// Declare a private struct
18181819
struct Foo;
@@ -2014,11 +2015,6 @@ type int8_t = i8;
20142015
- `no_start` - disable linking to the `native` crate, which specifies the
20152016
"start" language item.
20162017
- `no_std` - disable linking to the `std` crate.
2017-
- `plugin` — load a list of named crates as compiler plugins, e.g.
2018-
`#![plugin(foo, bar)]`. Optional arguments for each plugin,
2019-
i.e. `#![plugin(foo(... args ...))]`, are provided to the plugin's
2020-
registrar function. The `plugin` feature gate is required to use
2021-
this attribute.
20222018

20232019
### Module-only attributes
20242020

@@ -2087,7 +2083,7 @@ On `struct`s:
20872083
remove any padding between fields (note that this is very fragile and may
20882084
break platforms which require aligned access).
20892085

2090-
### Macro-related attributes
2086+
### Macro- and plugin-related attributes
20912087

20922088
- `macro_use` on a `mod` — macros defined in this module will be visible in the
20932089
module's parent, after this module has been included.
@@ -2102,8 +2098,13 @@ On `struct`s:
21022098

21032099
- `macro_export` - export a macro for cross-crate usage.
21042100

2105-
- `no_link` on an `extern crate` — even if we load this crate for macros, don't
2106-
link it into the output.
2101+
- `plugin` on an `extern crate` — load this crate as a [compiler
2102+
plugin][plugin]. The `plugin` feature gate is required. Any arguments to
2103+
the attribute, e.g. `#[plugin=...]` or `#[plugin(...)]`, are provided to the
2104+
plugin.
2105+
2106+
- `no_link` on an `extern crate` — even if we load this crate for macros or
2107+
compiler plugins, don't link it into the output.
21072108

21082109
See the [macros section of the
21092110
book](book/macros.html#scoping-and-macro-import/export) for more information on
@@ -2467,12 +2468,6 @@ The currently implemented features of the reference compiler are:
24672468

24682469
* `associated_types` - Allows type aliases in traits. Experimental.
24692470

2470-
* `no_std` - Allows the `#![no_std]` crate attribute, which disables the implicit
2471-
`extern crate std`. This typically requires use of the unstable APIs
2472-
behind the libstd "facade", such as libcore and libcollections. It
2473-
may also cause problems when using syntax extensions, including
2474-
`#[derive]`.
2475-
24762471
If a feature is promoted to a language feature, then all existing programs will
24772472
start to receive compilation warnings about #[feature] directives which enabled
24782473
the new feature (because the directive is no longer necessary). However, if a

0 commit comments

Comments
 (0)