Skip to content

Commit 2850edf

Browse files
committed
---
yaml --- r: 142767 b: refs/heads/try2 c: a89af1f h: refs/heads/master i: 142765: 78d3d01 142763: b1987f1 142759: ab317a8 142751: f625fbb v: v3
1 parent 303fba7 commit 2850edf

File tree

127 files changed

+3945
-10098
lines changed

Some content is hidden

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

127 files changed

+3945
-10098
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 9a9c84fb8362c26f24b1ea8443a509047f27b38f
8+
refs/heads/try2: a89af1fa4cc8548a1c5e0a655a196d94b047ccd7
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/Makefile.in

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -235,39 +235,6 @@ LIBRUST_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rust)
235235

236236
endef
237237

238-
# $(1) is the path for directory to match against
239-
# $(2) is the glob to use in the match
240-
# $(3) is filename (usually the target being created) to filter out from match
241-
# (i.e. filename is not out-of-date artifact from prior Rust version/build)
242-
#
243-
# Note that a common bug is to accidentally construct the glob denoted
244-
# by $(2) with a space character prefix, which invalidates the
245-
# construction $(1)$(2).
246-
define CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT
247-
$(Q)MATCHES="$(filter-out %$(3),$(wildcard $(1)/$(2)))"; if [ -n "$$MATCHES" ] ; then echo "Warning: there are previous" \'$(2)\' "libraries:" $$MATCHES; fi
248-
endef
249-
250-
# Same interface as above, but deletes rather than just listing the files.
251-
define REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT
252-
$(Q)MATCHES="$(filter-out %$(3),$(wildcard $(1)/$(2)))"; if [ -n "$$MATCHES" ] ; then echo "Warning: removing previous" \'$(2)\' "libraries:" $$MATCHES; rm -v $$MATCHES ; fi
253-
endef
254-
255-
# We use a different strategy for LIST_ALL_OLD_GLOB_MATCHES_EXCEPT
256-
# than in the macros above because it needs the result of running the
257-
# `ls` command after other rules in the command list have run; the
258-
# macro-expander for $(wildcard ...) would deliver its results too
259-
# soon. (This is in contrast to the macros above, which are meant to
260-
# be run at the outset of a command list in a rule.)
261-
ifdef VERBOSE
262-
define LIST_ALL_OLD_GLOB_MATCHES_EXCEPT
263-
@echo "Info: now are following matches for" '$(2)' "libraries:"
264-
@( cd $(1) && ( ls $(2) 2>/dev/null || true ) | grep -v $(3) || true )
265-
endef
266-
else
267-
define LIST_ALL_OLD_GLOB_MATCHES_EXCEPT
268-
endef
269-
endif
270-
271238
$(foreach target,$(CFG_TARGET_TRIPLES),\
272239
$(eval $(call DEF_LIBS,$(target))))
273240

branches/try2/configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,6 @@ do
731731
make_dir $h/test/perf
732732
make_dir $h/test/pretty
733733
make_dir $h/test/debug-info
734-
make_dir $h/test/codegen
735734
make_dir $h/test/doc-tutorial
736735
make_dir $h/test/doc-tutorial-ffi
737736
make_dir $h/test/doc-tutorial-macros

branches/try2/man/rust.1

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

branches/try2/man/rustc.1

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ Build a test harness
8686
\fB\-\-target\fR TRIPLE
8787
Target triple cpu-manufacturer-kernel[-os] to compile for (see
8888
http://sources.redhat.com/autobook/autobook/autobook_17.html
89-
for details)
89+
for detail)
9090
.TP
9191
\fB\-\-target-feature\fR TRIPLE
92-
Target-specific attributes (see llc -mattr=help for details)
92+
Target-specific attributes (see llc -mattr=help for detail)
9393
.TP
9494
\fB\-\-android-cross-path\fR PATH
9595
The path to the Android NDK
@@ -128,9 +128,6 @@ To build either with a crate (.rc) file:
128128
To build an executable with debug info (experimental):
129129
$ rustc -Z debug-info -o hello hello.rs
130130

131-
.SH "SEE ALSO"
132-
133-
rust, rustdoc, rustpkg, rusti
134131

135132
.SH "BUGS"
136133
See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.

branches/try2/man/rustdoc.1

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

branches/try2/man/rusti.1

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

0 commit comments

Comments
 (0)