Skip to content

Commit 4521993

Browse files
borsbors
committed
---
yaml --- r: 123825 b: refs/heads/master c: ffd9966 h: refs/heads/master i: 123823: bd98136 v: v3
1 parent ac59e7e commit 4521993

File tree

128 files changed

+1814
-898
lines changed

Some content is hidden

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

128 files changed

+1814
-898
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: e0ede9c6b3894851b800a323757857eba07943b5
2+
refs/heads/master: ffd9966c79ad034fe16e66e6c6795473473a6f50
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 8ddd286ea4ba4384a0dc9eae393ed515460a986e
55
refs/heads/try: 296eb104620b346d88bc4a2c2ab7693e6d3db019

‎trunk/man/rustc.1

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH RUSTC "1" "March 2014" "rustc 0.11.0" "User Commands"
1+
.TH RUSTC "1" "March 2014" "rustc 0.12.0-pre" "User Commands"
22
.SH NAME
33
rustc \- The Rust compiler
44
.SH SYNOPSIS
@@ -11,6 +11,9 @@ 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
1417
.TP
1518
\fB\-\-crate-type=[bin|lib|dylib|rlib|staticlib]\fR
1619
Configure the flavor of rust crate that is generated (default `bin`)
@@ -60,8 +63,9 @@ Parse only; do not compile, assemble, or link
6063
\fB\-\-pretty\fR [TYPE]
6164
Pretty-print the input instead of compiling; valid types are: normal
6265
(un-annotated source), expanded (crates expanded), typed (crates
63-
expanded, with type annotations), or identified (fully parenthesized,
64-
AST nodes and blocks with IDs)
66+
expanded, with type annotations), identified (fully parenthesized,
67+
AST nodes and blocks with IDs), or flowgraph=<nodeid> (graphviz
68+
formatted flowgraph for node)
6569
.TP
6670
\fB\-\-dep-info\fR [FILENAME]
6771
Output dependency info to <filename> after compiling, in o format suitable

‎trunk/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.11.0" "User Commands"
1+
.TH RUSTDOC "1" "March 2014" "rustdoc 0.12.0-pre" "User Commands"
22
.SH NAME
33
rustdoc \- generate documentation from Rust source code
44
.SH SYNOPSIS

‎trunk/mk/install.mk

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

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)"
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)"
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
23-
$(Q)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 | 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)"
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 $@
2729

2830
######################################################################
2931
# Android remote installation

‎trunk/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.11.0
17-
CFG_RELEASE_LABEL=
16+
CFG_RELEASE_NUM=0.12.0
17+
CFG_RELEASE_LABEL=-pre
1818

1919
CFG_FILENAME_EXTRA=4e7c5e5c
2020

‎trunk/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.11.0-pre (443a1cd 2014-06-08 14:56:52 -0700)
93+
rustc 0.12.0-pre (443a1cd 2014-06-08 14:56:52 -0700)
9494
```
9595

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

‎trunk/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.11.0-pre\n"
8+
"Project-Id-Version: Rust 0.12.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"

‎trunk/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.11.0-pre\n"
8+
"Project-Id-Version: Rust 0.12.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"

‎trunk/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.11.0-pre\n"
8+
"Project-Id-Version: Rust 0.12.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"

‎trunk/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.11.0-pre\n"
8+
"Project-Id-Version: Rust 0.12.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"

‎trunk/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.11.0-pre\n"
8+
"Project-Id-Version: Rust 0.12.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"

‎trunk/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.11.0-pre\n"
8+
"Project-Id-Version: Rust 0.12.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"

‎trunk/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.11.0-pre\n"
8+
"Project-Id-Version: Rust 0.12.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"

‎trunk/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.11.0-pre\n"
8+
"Project-Id-Version: Rust 0.12.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"

‎trunk/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.11.0-pre\n"
8+
"Project-Id-Version: Rust 0.12.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"

‎trunk/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.11.0-pre\n"
8+
"Project-Id-Version: Rust 0.12.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"

‎trunk/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.11.0-pre\n"
8+
"Project-Id-Version: Rust 0.12.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"

‎trunk/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.11.0-pre\n"
8+
"Project-Id-Version: Rust 0.12.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"

‎trunk/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.11.0-pre\n"
8+
"Project-Id-Version: Rust 0.12.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"

‎trunk/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.11.0-pre\n"
8+
"Project-Id-Version: Rust 0.12.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"

‎trunk/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.11.0-pre\n"
8+
"Project-Id-Version: Rust 0.12.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"

‎trunk/src/etc/install.sh

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,17 @@ 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+
469480
# Sanity check: can we run the installed binaries?
470481
#
471482
# As with the verification above, make sure the right LD_LIBRARY_PATH-equivalent
@@ -489,13 +500,11 @@ then
489500
err "${ERR}"
490501
else
491502
echo
492-
echo " please ensure '${CFG_PREFIX}/lib' is added to ${CFG_LD_PATH_VAR}"
493-
echo
503+
echo " Note: please ensure '${CFG_PREFIX}/lib' is added to ${CFG_LD_PATH_VAR}"
494504
fi
495505
fi
496506
fi
497507

498-
499508
echo
500509
echo " Rust is ready to roll."
501510
echo

‎trunk/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.11.0" kateversion="2.4" section="Sources" extensions="*.rs" mimetype="text/x-rust" priority="15">
10+
<language name="Rust" version="0.12.0-pre" kateversion="2.4" section="Sources" extensions="*.rs" mimetype="text/x-rust" priority="15">
1111
<highlighting>
1212
<list name="fn">
1313
<item> fn </item>

‎trunk/src/etc/zsh/_rust

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ _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'[Output the file(s) that would be written if compilation continued and exit]'
13-
--crate-name'[Output the crate name and exit]'
14-
--dep-info'[Output dependency info to <filename> after compiling]'
12+
--crate-file-name'[deprecated in favor of --print-file-name]'
13+
--crate-name'[Specify the name of the crate being built]'
1514
--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)]'
16+
--dep-info'[Output dependency info to <filename> after compiling]'
17+
-g'[Equivalent to --debuginfo=2]'
1618
{-h,--help}'[Display this message]'
1719
-L'[Add a directory to the library search path]'
1820
--linker'[Program to use for linking instead of the default.]'
@@ -29,6 +31,8 @@ _rustc_opts_switches=(
2931
--parse-only'[Parse only; do not compile, assemble, or link]'
3032
--passes'[Comma or space separated list of pass names to use]'
3133
--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]'
3236
--save-temps'[Write intermediate files (.bc, .opt.bc, .o) in addition to normal output]'
3337
--sysroot'[Override the system root]'
3438
--test'[Build a test harness]'

‎trunk/src/libarena/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#![license = "MIT/ASL2"]
2727
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
2828
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
29-
html_root_url = "http://doc.rust-lang.org/0.11.0/")]
29+
html_root_url = "http://doc.rust-lang.org/master/")]
3030

3131
#![feature(unsafe_destructor)]
3232
#![allow(missing_doc)]

‎trunk/src/libcollections/hash/sip.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ pub fn hash_with_keys<T: Hash<SipState>>(k0: u64, k1: u64, value: &T) -> u64 {
269269
mod tests {
270270
use test::Bencher;
271271
use std::prelude::*;
272-
use std::num::ToStrRadix;
272+
use std::fmt;
273273

274274
use str::Str;
275275
use string::String;
@@ -370,7 +370,7 @@ mod tests {
370370
fn to_hex_str(r: &[u8, ..8]) -> String {
371371
let mut s = String::new();
372372
for b in r.iter() {
373-
s.push_str((*b as uint).to_str_radix(16u).as_slice());
373+
s.push_str(format!("{}", fmt::radix(*b, 16)).as_slice());
374374
}
375375
s
376376
}
@@ -391,7 +391,7 @@ mod tests {
391391
let r = result_bytes(h);
392392
let mut s = String::new();
393393
for b in r.iter() {
394-
s.push_str((*b as uint).to_str_radix(16u).as_slice());
394+
s.push_str(format!("{}", fmt::radix(*b, 16)).as_slice());
395395
}
396396
s
397397
}

‎trunk/src/libcollections/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#![license = "MIT/ASL2"]
1919
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
2020
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
21-
html_root_url = "http://doc.rust-lang.org/0.11.0/",
21+
html_root_url = "http://doc.rust-lang.org/master/",
2222
html_playground_url = "http://play.rust-lang.org/")]
2323

2424
#![feature(macro_rules, managed_boxes, default_type_params, phase, globs)]

‎trunk/src/libcollections/treemap.rs

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use core::iter::Peekable;
2222
use core::iter;
2323
use core::mem::{replace, swap};
2424
use core::ptr;
25+
use std::hash::{Writer, Hash};
2526

2627
use {Collection, Mutable, Set, MutableSet, MutableMap, Map};
2728
use vec::Vec;
@@ -1055,6 +1056,14 @@ impl<K: Ord, V> Extendable<(K, V)> for TreeMap<K, V> {
10551056
}
10561057
}
10571058

1059+
impl<S: Writer, K: Ord + Hash<S>, V: Hash<S>> Hash<S> for TreeMap<K, V> {
1060+
fn hash(&self, state: &mut S) {
1061+
for elt in self.iter() {
1062+
elt.hash(state);
1063+
}
1064+
}
1065+
}
1066+
10581067
impl<T: Ord> FromIterator<T> for TreeSet<T> {
10591068
fn from_iter<Iter: Iterator<T>>(iter: Iter) -> TreeSet<T> {
10601069
let mut set = TreeSet::new();
@@ -1072,6 +1081,14 @@ impl<T: Ord> Extendable<T> for TreeSet<T> {
10721081
}
10731082
}
10741083

1084+
impl<S: Writer, T: Ord + Hash<S>> Hash<S> for TreeSet<T> {
1085+
fn hash(&self, state: &mut S) {
1086+
for elt in self.iter() {
1087+
elt.hash(state);
1088+
}
1089+
}
1090+
}
1091+
10751092
#[cfg(test)]
10761093
mod test_treemap {
10771094
use std::prelude::*;
@@ -1608,6 +1625,7 @@ mod bench {
16081625
#[cfg(test)]
16091626
mod test_set {
16101627
use std::prelude::*;
1628+
use std::hash;
16111629

16121630
use {Set, MutableSet, Mutable, MutableMap};
16131631
use super::{TreeMap, TreeSet};
@@ -1748,6 +1766,22 @@ mod test_set {
17481766
assert!(m.clone() == m);
17491767
}
17501768

1769+
#[test]
1770+
fn test_hash() {
1771+
let mut x = TreeSet::new();
1772+
let mut y = TreeSet::new();
1773+
1774+
x.insert(1i);
1775+
x.insert(2);
1776+
x.insert(3);
1777+
1778+
y.insert(3i);
1779+
y.insert(2);
1780+
y.insert(1);
1781+
1782+
assert!(hash::hash(&x) == hash::hash(&y));
1783+
}
1784+
17511785
fn check(a: &[int],
17521786
b: &[int],
17531787
expected: &[int],

0 commit comments

Comments
 (0)