Skip to content

Commit 05aa6d2

Browse files
borsbors
committed
---
yaml --- r: 64759 b: refs/heads/snap-stage3 c: 4989799 h: refs/heads/master i: 64757: 3cae3da 64755: 32b00b9 64751: 50279f6 v: v3
1 parent 58171be commit 05aa6d2

Some content is hidden

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

41 files changed

+800
-887
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: b782d42cba297ba2a3eec23985f778407a001555
4+
refs/heads/snap-stage3: 4989799799df1fb7c23fc0bf017be8faa356387f
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/doc/rust.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1494,7 +1494,7 @@ mod m1 {
14941494
This example shows how one can use `allow` and `warn` to toggle
14951495
a particular check on and off.
14961496

1497-
~~~{.xfail-test}
1497+
~~~
14981498
#[warn(missing_doc)]
14991499
mod m2{
15001500
#[allow(missing_doc)]

‎branches/snap-stage3/doc/tutorial.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,6 @@ let mut x = 5;
11541154
let y = &x; // x is now frozen, it cannot be modified
11551155
}
11561156
// x is now unfrozen again
1157-
# x = 3;
11581157
~~~~
11591158
11601159
Mutable managed boxes handle freezing dynamically when any of their contents

‎branches/snap-stage3/mk/target.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3)): \
8484
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): CFG_COMPILER_TRIPLE = $(2)
8585
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): \
8686
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
87+
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
8788
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)) \
8889
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3)) \
8990
| $$(TLIB$(1)_T_$(2)_H_$(3))/
@@ -94,6 +95,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): \
9495

9596
$$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X_$(3)): \
9697
$$(DRIVER_CRATE) \
98+
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
9799
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)) \
98100
| $$(TBIN$(1)_T_$(2)_H_$(3))/
99101
@$$(call E, compile_and_link: $$@)

‎branches/snap-stage3/mk/tests.mk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,50 +319,58 @@ endif
319319

320320
$(3)/stage$(1)/test/stdtest-$(2)$$(X_$(2)): \
321321
$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
322+
$$(SREQ$(1)_T_$(2)_H_$(3)) \
322323
$$(STDTESTDEP_$(1)_$(2)_$(3))
323324
@$$(call E, compile_and_link: $$@)
324325
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
325326

326327
$(3)/stage$(1)/test/extratest-$(2)$$(X_$(2)): \
327328
$$(EXTRALIB_CRATE) $$(EXTRALIB_INPUTS) \
329+
$$(SREQ$(1)_T_$(2)_H_$(3)) \
328330
$$(STDTESTDEP_$(1)_$(2)_$(3))
329331
@$$(call E, compile_and_link: $$@)
330332
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
331333

332334
$(3)/stage$(1)/test/syntaxtest-$(2)$$(X_$(2)): \
333335
$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
336+
$$(SREQ$(1)_T_$(2)_H_$(3)) \
334337
$$(STDTESTDEP_$(1)_$(2)_$(3))
335338
@$$(call E, compile_and_link: $$@)
336339
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
337340

338341
$(3)/stage$(1)/test/rustctest-$(2)$$(X_$(2)): CFG_COMPILER_TRIPLE = $(2)
339342
$(3)/stage$(1)/test/rustctest-$(2)$$(X_$(2)): \
340343
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
344+
$$(SREQ$(1)_T_$(2)_H_$(3)) \
341345
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM_$(2)) \
342346
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2))
343347
@$$(call E, compile_and_link: $$@)
344348
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
345349

346350
$(3)/stage$(1)/test/rustpkgtest-$(2)$$(X_$(2)): \
347351
$$(RUSTPKG_LIB) $$(RUSTPKG_INPUTS) \
352+
$$(SREQ$(1)_T_$(2)_H_$(3)) \
348353
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
349354
@$$(call E, compile_and_link: $$@)
350355
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
351356

352357
$(3)/stage$(1)/test/rustitest-$(2)$$(X_$(2)): \
353358
$$(RUSTI_LIB) $$(RUSTI_INPUTS) \
359+
$$(SREQ$(1)_T_$(2)_H_$(3)) \
354360
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
355361
@$$(call E, compile_and_link: $$@)
356362
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
357363

358364
$(3)/stage$(1)/test/rusttest-$(2)$$(X_$(2)): \
359365
$$(RUST_LIB) $$(RUST_INPUTS) \
366+
$$(SREQ$(1)_T_$(2)_H_$(3)) \
360367
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
361368
@$$(call E, compile_and_link: $$@)
362369
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
363370

364371
$(3)/stage$(1)/test/rustdoctest-$(2)$$(X_$(2)): \
365372
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
373+
$$(SREQ$(1)_T_$(2)_H_$(3)) \
366374
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
367375
@$$(call E, compile_and_link: $$@)
368376
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test

‎branches/snap-stage3/mk/tools.mk

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,14 @@ define TOOLS_STAGE_N_TARGET
3737

3838
$$(TBIN$(1)_T_$(4)_H_$(3))/compiletest$$(X_$(4)): \
3939
$$(COMPILETEST_CRATE) $$(COMPILETEST_INPUTS) \
40-
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
41-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
42-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4)) \
40+
$$(SREQ$(1)_T_$(4)_H_$(3)) \
4341
| $$(TBIN$(1)_T_$(4)_H_$(3))/
4442
@$$(call E, compile_and_link: $$@)
4543
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$<
4644

4745
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)): \
4846
$$(RUSTPKG_LIB) $$(RUSTPKG_INPUTS) \
49-
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
50-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
51-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4)) \
47+
$$(SREQ$(1)_T_$(4)_H_$(3)) \
5248
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4)) \
5349
| $$(TLIB$(1)_T_$(4)_H_$(3))/
5450
@$$(call E, compile_and_link: $$@)
@@ -58,16 +54,15 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)): \
5854

5955
$$(TBIN$(1)_T_$(4)_H_$(3))/rustpkg$$(X_$(4)): \
6056
$$(DRIVER_CRATE) \
61-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)) \
57+
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
58+
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)) \
6259
| $$(TBIN$(1)_T_$(4)_H_$(3))/
6360
@$$(call E, compile_and_link: $$@)
6461
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rustpkg -o $$@ $$<
6562

6663
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOC_$(4)): \
6764
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
68-
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
69-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
70-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4)) \
65+
$$(SREQ$(1)_T_$(4)_H_$(3)) \
7166
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4)) \
7267
| $$(TLIB$(1)_T_$(4)_H_$(3))/
7368
@$$(call E, compile_and_link: $$@)
@@ -77,16 +72,15 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOC_$(4)): \
7772

7873
$$(TBIN$(1)_T_$(4)_H_$(3))/rustdoc$$(X_$(4)): \
7974
$$(DRIVER_CRATE) \
75+
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
8076
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOC_$(4)) \
8177
| $$(TBIN$(1)_T_$(4)_H_$(3))/
8278
@$$(call E, compile_and_link: $$@)
8379
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rustdoc -o $$@ $$<
8480

8581
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTI_$(4)): \
8682
$$(RUSTI_LIB) $$(RUSTI_INPUTS) \
87-
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
88-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
89-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4)) \
83+
$$(SREQ$(1)_T_$(4)_H_$(3)) \
9084
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4)) \
9185
| $$(TLIB$(1)_T_$(4)_H_$(3))/
9286
@$$(call E, compile_and_link: $$@)
@@ -96,16 +90,15 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTI_$(4)): \
9690

9791
$$(TBIN$(1)_T_$(4)_H_$(3))/rusti$$(X_$(4)): \
9892
$$(DRIVER_CRATE) \
93+
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
9994
$$(TLIB$(1)_T_$(4)_H_$(4))/$(CFG_LIBRUSTI_$(4)) \
10095
| $$(TBIN$(1)_T_$(4)_H_$(3))/
10196
@$$(call E, compile_and_link: $$@)
10297
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rusti -o $$@ $$<
10398

10499
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUST_$(4)): \
105100
$$(RUST_LIB) $$(RUST_INPUTS) \
106-
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
107-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
108-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4)) \
101+
$$(SREQ$(1)_T_$(4)_H_$(3)) \
109102
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)) \
110103
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTI_$(4)) \
111104
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOC_$(4)) \
@@ -118,6 +111,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUST_$(4)): \
118111

119112
$$(TBIN$(1)_T_$(4)_H_$(3))/rust$$(X_$(4)): \
120113
$$(DRIVER_CRATE) \
114+
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
121115
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUST_$(4)) \
122116
| $$(TBIN$(1)_T_$(4)_H_$(3))/
123117
@$$(call E, compile_and_link: $$@)

‎branches/snap-stage3/src/compiletest/runtest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ fn make_out_name(config: &config, testfile: &Path, extension: &str) -> Path {
681681
}
682682

683683
fn aux_output_dir_name(config: &config, testfile: &Path) -> Path {
684-
output_base_name(config, testfile).with_filetype("libaux")
684+
Path(output_base_name(config, testfile).to_str() + ".libaux")
685685
}
686686

687687
fn output_testname(testfile: &Path) -> Path {

‎branches/snap-stage3/src/etc/emacs/Makefile

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

‎branches/snap-stage3/src/etc/emacs/README.md

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,8 @@ file:
1313
(add-to-list 'load-path "/path/to/rust-mode/")
1414
(require 'rust-mode)
1515

16-
Make sure you byte-compile the .el files first, or the mode will be
17-
painfully slow. There is an included `Makefile` which will do it for
18-
you, so in the simplest case you can just run `make` and everything
19-
should Just Work.
20-
21-
If for some reason that doesn't work, you can byte compile manually,
22-
by pasting this in your `*scratch*` buffer, moving the cursor below
23-
it, and pressing `C-j`:
24-
25-
(progn
26-
(byte-compile-file "/path/to/rust-mode/cm-mode.el" t)
27-
(byte-compile-file "/path/to/rust-mode/rust-mode.el" t))
28-
29-
Rust mode will automatically be associated with .rs and .rc files. To
30-
enable it explicitly, do `M-x rust-mode`.
16+
Rust mode will automatically be associated with .rs files. To enable it
17+
explicitly, do `M-x rust-mode`.
3118

3219
### package.el installation via Marmalade or MELPA
3320

@@ -67,24 +54,6 @@ should upgrade in order to support installation from multiple sources.
6754
The ELPA archive is deprecated and no longer accepting new packages,
6855
so the version there (1.7.1) is very outdated.
6956

70-
#### Important
71-
72-
In order to have cm-mode properly initialized after compilation prior
73-
to rust-mode.el compilation you will need to add these `advices` to
74-
your init file or if you are a melpa user install the `melpa` package.
75-
76-
```lisp
77-
(defadvice package-download-tar
78-
(after package-download-tar-initialize activate compile)
79-
"initialize the package after compilation"
80-
(package-initialize))
81-
82-
(defadvice package-download-single
83-
(after package-download-single-initialize activate compile)
84-
"initialize the package after compilation"
85-
(package-initialize))
86-
```
87-
8857
#### Install rust-mode
8958

9059
From there you can install rust-mode or any other modes by choosing

0 commit comments

Comments
 (0)