Skip to content

Commit ff00405

Browse files
author
blake2-ppc
committed
---
yaml --- r: 79829 b: refs/heads/try c: 6212729 h: refs/heads/master i: 79827: fcf715f v: v3
1 parent b2ef5b9 commit ff00405

File tree

123 files changed

+1545
-2418
lines changed

Some content is hidden

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

123 files changed

+1545
-2418
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: ba9fa89bfb4aae53db93e9ecac31807af96356fc
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 54ae2800ffb30513f89ce13d27ac3c8d095d98ac
5-
refs/heads/try: 8c7c0b41d7b1a3f240301387fa4152a060d532e4
5+
refs/heads/try: 6212729315be2ac80785ffcecfe0a80c9955c4cf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/doc/tutorial-container.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ for i in range(0, 5) {
200200
printf!("%d ", i) // prints "0 1 2 3 4"
201201
}
202202

203-
for i in std::iter::range_inclusive(0, 5) { // needs explicit import
203+
for i in std::iterator::range_inclusive(0, 5) { // needs explicit import
204204
printf!("%d ", i) // prints "0 1 2 3 4 5"
205205
}
206206
~~~

branches/try/mk/rt.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ LIBUV_NO_LOAD = run-benchmarks.target.mk run-tests.target.mk \
176176

177177
export PYTHONPATH := $(PYTHONPATH):$$(S)src/gyp/pylib
178178

179-
$$(LIBUV_MAKEFILE_$(1)_$(2)): $$(LIBUV_DEPS)
179+
$$(LIBUV_MAKEFILE_$(1)_$(2)):
180180
(cd $(S)src/libuv/ && \
181-
$$(CFG_PYTHON) ./gyp_uv -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) -D ninja \
181+
./gyp_uv -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) -D ninja \
182182
-Goutput_dir=$$(@D) --generator-output $$(@D))
183183

184184
# XXX: Shouldn't need platform-specific conditions here

branches/try/src/etc/emacs/README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,6 @@ marking, press x, and ELPA will install the packages for you (under
6868

6969
* or using <kbd>M-x package-install rust-mode
7070

71-
### Tests via ERT
72-
73-
The file `rust-mode-tests.el` contains tests that can be run via ERT. You can
74-
use `run_rust_emacs_tests.sh` to run them in batch mode, if emacs is somewhere
75-
in your `$PATH`.
76-
7771
### Known bugs
7872

7973
* Combining `global-whitespace-mode` and `rust-mode` is generally glitchy.

branches/try/src/etc/emacs/run_rust_emacs_tests.sh

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

0 commit comments

Comments
 (0)