Skip to content

Commit 67c6024

Browse files
aturonaturon
committed
---
yaml --- r: 131813 b: refs/heads/dist-snap c: e0ede9c h: refs/heads/master i: 131811: 3655933 v: v3
1 parent e6a75b4 commit 67c6024

File tree

173 files changed

+1010
-1921
lines changed

Some content is hidden

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

173 files changed

+1010
-1921
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 457a3c991d79b971be07fce75f9d0c12848fb37c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 7a6208f2cc1bbe29dc42b21d27e98894b8bacc04
9+
refs/heads/dist-snap: e0ede9c6b3894851b800a323757857eba07943b5
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

‎branches/dist-snap/man/rustc.1

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH RUSTC "1" "March 2014" "rustc 0.12.0-pre" "User Commands"
1+
.TH RUSTC "1" "March 2014" "rustc 0.11.0" "User Commands"
22
.SH NAME
33
rustc \- The Rust compiler
44
.SH SYNOPSIS
@@ -11,9 +11,6 @@ This program is a compiler for the Rust language, available at
1111

1212
.SH OPTIONS
1313

14-
.TP
15-
\fB\-\-crate-name NAME\fR
16-
Specify the name of the crate being built
1714
.TP
1815
\fB\-\-crate-type=[bin|lib|dylib|rlib|staticlib]\fR
1916
Configure the flavor of rust crate that is generated (default `bin`)
@@ -63,9 +60,8 @@ Parse only; do not compile, assemble, or link
6360
\fB\-\-pretty\fR [TYPE]
6461
Pretty-print the input instead of compiling; valid types are: normal
6562
(un-annotated source), expanded (crates expanded), typed (crates
66-
expanded, with type annotations), identified (fully parenthesized,
67-
AST nodes and blocks with IDs), or flowgraph=<nodeid> (graphviz
68-
formatted flowgraph for node)
63+
expanded, with type annotations), or identified (fully parenthesized,
64+
AST nodes and blocks with IDs)
6965
.TP
7066
\fB\-\-dep-info\fR [FILENAME]
7167
Output dependency info to <filename> after compiling, in o format suitable

‎branches/dist-snap/man/rustdoc.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH RUSTDOC "1" "March 2014" "rustdoc 0.12.0-pre" "User Commands"
1+
.TH RUSTDOC "1" "March 2014" "rustdoc 0.11.0" "User Commands"
22
.SH NAME
33
rustdoc \- generate documentation from Rust source code
44
.SH SYNOPSIS

‎branches/dist-snap/mk/install.mk

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,16 @@ else
1414
MAYBE_DISABLE_VERIFY=
1515
endif
1616

17-
install: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir
18-
$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)"
17+
install: dist-install-dir-$(CFG_BUILD)-with-target-libs
18+
$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)"
1919
# Remove tmp files while we can because they may have been created under sudo
2020
$(Q)rm -R tmp/dist
2121

22-
uninstall: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir
23-
$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
22+
uninstall: dist-install-dir-$(CFG_BUILD)-with-target-libs
23+
$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
2424
# Remove tmp files while we can because they may have been created under sudo
2525
$(Q)rm -R tmp/dist
2626

27-
tmp/empty_dir:
28-
mkdir -p $@
2927

3028
######################################################################
3129
# Android remote installation

‎branches/dist-snap/mk/main.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
######################################################################
1414

1515
# The version number
16-
CFG_RELEASE_NUM=0.12.0
17-
CFG_RELEASE_LABEL=-pre
16+
CFG_RELEASE_NUM=0.11.0
17+
CFG_RELEASE_LABEL=
1818

1919
CFG_FILENAME_EXTRA=4e7c5e5c
2020

‎branches/dist-snap/src/doc/guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ $ rustc --version
9090
You should see some output that looks something like this:
9191

9292
```{ignore}
93-
rustc 0.12.0-pre (443a1cd 2014-06-08 14:56:52 -0700)
93+
rustc 0.11.0-pre (443a1cd 2014-06-08 14:56:52 -0700)
9494
```
9595

9696
If you did, Rust has been installed successfully! Congrats!

‎branches/dist-snap/src/doc/po/ja/complement-cheatsheet.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.12.0-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/dist-snap/src/doc/po/ja/complement-lang-faq.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.12.0-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/dist-snap/src/doc/po/ja/complement-project-faq.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.12.0-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/dist-snap/src/doc/po/ja/complement-usage-faq.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.12.0-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-02-03 08:13+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/dist-snap/src/doc/po/ja/guide-conditions.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.12.0-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/dist-snap/src/doc/po/ja/guide-container.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.12.0-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/dist-snap/src/doc/po/ja/guide-ffi.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.12.0-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/dist-snap/src/doc/po/ja/guide-lifetimes.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.12.0-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/dist-snap/src/doc/po/ja/guide-macros.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.12.0-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/dist-snap/src/doc/po/ja/guide-pointers.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.12.0-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/dist-snap/src/doc/po/ja/guide-runtime.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.12.0-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-02-03 08:13+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/dist-snap/src/doc/po/ja/guide-tasks.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.12.0-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/dist-snap/src/doc/po/ja/guide-testing.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.12.0-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/dist-snap/src/doc/po/ja/index.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.12.0-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-14 21:02+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/dist-snap/src/doc/po/ja/rustdoc.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.12.0-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

‎branches/dist-snap/src/etc/install.sh

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -466,17 +466,6 @@ while read p; do
466466
# The manifest lists all files to install
467467
done < "${CFG_SRC_DIR}/${CFG_LIBDIR_RELATIVE}/rustlib/manifest.in"
468468

469-
# Run ldconfig to make dynamic libraries available to the linker
470-
if [ "$CFG_OSTYPE" = "Linux" ]
471-
then
472-
ldconfig
473-
if [ $? -ne 0 ]
474-
then
475-
warn "failed to run ldconfig."
476-
warn "this may happen when not installing as root and may be fine"
477-
fi
478-
fi
479-
480469
# Sanity check: can we run the installed binaries?
481470
#
482471
# As with the verification above, make sure the right LD_LIBRARY_PATH-equivalent
@@ -500,11 +489,13 @@ then
500489
err "${ERR}"
501490
else
502491
echo
503-
echo " Note: please ensure '${CFG_PREFIX}/lib' is added to ${CFG_LD_PATH_VAR}"
492+
echo " please ensure '${CFG_PREFIX}/lib' is added to ${CFG_LD_PATH_VAR}"
493+
echo
504494
fi
505495
fi
506496
fi
507497

498+
508499
echo
509500
echo " Rust is ready to roll."
510501
echo

‎branches/dist-snap/src/etc/kate/rust.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
88
<!ENTITY rustIntSuf "([iu](8|16|32|64)?)?">
99
]>
10-
<language name="Rust" version="0.12.0-pre" kateversion="2.4" section="Sources" extensions="*.rs" mimetype="text/x-rust" priority="15">
10+
<language name="Rust" version="0.11.0" kateversion="2.4" section="Sources" extensions="*.rs" mimetype="text/x-rust" priority="15">
1111
<highlighting>
1212
<list name="fn">
1313
<item> fn </item>

‎branches/dist-snap/src/etc/zsh/_rust

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ _rustc_opts_switches=(
99
-c'[Compile and assemble, but do not link]'
1010
--cfg'[Configure the compilation environment]'
1111
--crate-id'[Output the crate id and exit]'
12-
--crate-file-name'[deprecated in favor of --print-file-name]'
13-
--crate-name'[Specify the name of the crate being built]'
14-
--crate-type'[Specify the type of crate to crate]'
15-
--debuginfo'[Emit DWARF debug info to the objects created: 0 = no debug info, 1 = line-tables only (for stacktraces and breakpoints), 2 = full debug info with variable and type information (same as -g)]'
12+
--crate-file-name'[Output the file(s) that would be written if compilation continued and exit]'
13+
--crate-name'[Output the crate name and exit]'
1614
--dep-info'[Output dependency info to <filename> after compiling]'
17-
-g'[Equivalent to --debuginfo=2]'
15+
--crate-type'[Specify the type of crate to crate]'
1816
{-h,--help}'[Display this message]'
1917
-L'[Add a directory to the library search path]'
2018
--linker'[Program to use for linking instead of the default.]'
@@ -31,8 +29,6 @@ _rustc_opts_switches=(
3129
--parse-only'[Parse only; do not compile, assemble, or link]'
3230
--passes'[Comma or space separated list of pass names to use]'
3331
--pretty'[Pretty-print the input instead of compiling]'
34-
--print-crate-name'[Output the crate name and exit]'
35-
--print-file-name'[Output the file(s) that would be written if compilation continued and exit]'
3632
--save-temps'[Write intermediate files (.bc, .opt.bc, .o) in addition to normal output]'
3733
--sysroot'[Override the system root]'
3834
--test'[Build a test harness]'

0 commit comments

Comments
 (0)