Skip to content

Commit effca42

Browse files
borsbors
committed
---
yaml --- r: 159092 b: refs/heads/snap-stage3 c: 5db8381 h: refs/heads/master v: v3
1 parent 5867167 commit effca42

Some content is hidden

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

93 files changed

+817
-1195
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: 40fb87d40f681f5356af42175fc7b85da387f037
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 7dab9037257f9ccdce58d5e7c8ecfc7932355b09
4+
refs/heads/snap-stage3: 5db8381c7e3506d50dbb2152ad0161b9e214ac3c
55
refs/heads/try: f58aad6dce273570fb130b4df008ef9acd5a5be2
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5274,7 +5274,7 @@ let result = task::try(proc() {
52745274

52755275
This task will randomly panic or succeed. `task::try` returns a `Result`
52765276
type, so we can handle the response like any other computation that may
5277-
panic.
5277+
fail.
52785278

52795279
# Macros
52805280

‎branches/snap-stage3/src/etc/emacs/rust-mode.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
"false" "fn" "for"
177177
"if" "impl" "in"
178178
"let" "loop"
179-
"match" "mod" "mut"
179+
"match" "mod" "move" "mut"
180180
"priv" "proc" "pub"
181181
"ref" "return"
182182
"self" "static" "struct" "super"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<item> loop </item>
3535
<item> match </item>
3636
<item> mod </item>
37+
<item> move </item>
3738
<item> mut </item>
3839
<item> priv </item>
3940
<item> pub </item>

‎branches/snap-stage3/src/etc/make-win-dist.py

Lines changed: 45 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def find_files(files, path):
2323
return found
2424

2525
def make_win_dist(dist_root, target_triple):
26-
# Ask gcc where it keeps its' stuff
26+
# Ask gcc where it keeps its stuff
2727
gcc_out = subprocess.check_output(["gcc.exe", "-print-search-dirs"])
2828
bin_path = os.environ["PATH"].split(os.pathsep)
2929
lib_path = []
@@ -42,11 +42,48 @@ def make_win_dist(dist_root, target_triple):
4242
else:
4343
rustc_dlls.append("libgcc_s_seh-1.dll")
4444

45-
target_libs = ["crtbegin.o", "crtend.o", "crt2.o", "dllcrt2.o",
46-
"libadvapi32.a", "libcrypt32.a", "libgcc.a", "libgcc_eh.a", "libgcc_s.a",
47-
"libimagehlp.a", "libiphlpapi.a", "libkernel32.a", "libm.a", "libmingw32.a",
48-
"libmingwex.a", "libmsvcrt.a", "libpsapi.a", "libshell32.a", "libstdc++.a",
49-
"libuser32.a", "libws2_32.a", "libiconv.a", "libmoldname.a"]
45+
target_libs = [ # MinGW libs
46+
"crtbegin.o",
47+
"crtend.o",
48+
"crt2.o",
49+
"dllcrt2.o",
50+
"libgcc.a",
51+
"libgcc_eh.a",
52+
"libgcc_s.a",
53+
"libm.a",
54+
"libmingw32.a",
55+
"libmingwex.a",
56+
"libstdc++.a",
57+
"libiconv.a",
58+
"libmoldname.a",
59+
# Windows import libs
60+
"libadvapi32.a",
61+
"libbcrypt.a",
62+
"libcomctl32.a",
63+
"libcomdlg32.a",
64+
"libcrypt32.a",
65+
"libctl3d32.a",
66+
"libgdi32.a",
67+
"libimagehlp.a",
68+
"libiphlpapi.a",
69+
"libkernel32.a",
70+
"libmsvcrt.a",
71+
"libodbc32.a",
72+
"libole32.a",
73+
"liboleaut32.a",
74+
"libopengl32.a",
75+
"libpsapi.a",
76+
"librpcrt4.a",
77+
"libsetupapi.a",
78+
"libshell32.a",
79+
"libuser32.a",
80+
"libuuid.a",
81+
"libwinhttp.a",
82+
"libwinmm.a",
83+
"libwinspool.a",
84+
"libws2_32.a",
85+
"libwsock32.a",
86+
]
5087

5188
# Find mingw artifacts we want to bundle
5289
target_tools = find_files(target_tools, bin_path)
@@ -59,14 +96,14 @@ def make_win_dist(dist_root, target_triple):
5996
shutil.copy(src, dist_bin_dir)
6097

6198
# Copy platform tools to platform-specific bin directory
62-
target_bin_dir = os.path.join(dist_root, "bin", "rustlib", target_triple, "gcc", "bin")
99+
target_bin_dir = os.path.join(dist_root, "bin", "rustlib", target_triple, "bin")
63100
if not os.path.exists(target_bin_dir):
64101
os.makedirs(target_bin_dir)
65102
for src in target_tools:
66103
shutil.copy(src, target_bin_dir)
67104

68105
# Copy platform libs to platform-spcific lib directory
69-
target_lib_dir = os.path.join(dist_root, "bin", "rustlib", target_triple, "gcc", "lib")
106+
target_lib_dir = os.path.join(dist_root, "bin", "rustlib", target_triple, "lib")
70107
if not os.path.exists(target_lib_dir):
71108
os.makedirs(target_lib_dir)
72109
for src in target_libs:

‎branches/snap-stage3/src/liballoc/boxed.rs

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -65,50 +65,12 @@ impl<T: Clone> Clone for Box<T> {
6565
}
6666
}
6767

68-
// NOTE(stage0): remove impl after a snapshot
69-
#[cfg(stage0)]
70-
impl<T:PartialEq> PartialEq for Box<T> {
71-
#[inline]
72-
fn eq(&self, other: &Box<T>) -> bool { *(*self) == *(*other) }
73-
#[inline]
74-
fn ne(&self, other: &Box<T>) -> bool { *(*self) != *(*other) }
75-
}
76-
// NOTE(stage0): remove impl after a snapshot
77-
#[cfg(stage0)]
78-
impl<T:PartialOrd> PartialOrd for Box<T> {
79-
#[inline]
80-
fn partial_cmp(&self, other: &Box<T>) -> Option<Ordering> {
81-
(**self).partial_cmp(&**other)
82-
}
83-
#[inline]
84-
fn lt(&self, other: &Box<T>) -> bool { *(*self) < *(*other) }
85-
#[inline]
86-
fn le(&self, other: &Box<T>) -> bool { *(*self) <= *(*other) }
87-
#[inline]
88-
fn ge(&self, other: &Box<T>) -> bool { *(*self) >= *(*other) }
89-
#[inline]
90-
fn gt(&self, other: &Box<T>) -> bool { *(*self) > *(*other) }
91-
}
92-
// NOTE(stage0): remove impl after a snapshot
93-
#[cfg(stage0)]
94-
impl<T: Ord> Ord for Box<T> {
95-
#[inline]
96-
fn cmp(&self, other: &Box<T>) -> Ordering {
97-
(**self).cmp(&**other)
98-
}
99-
}
100-
// NOTE(stage0): remove impl after a snapshot
101-
#[cfg(stage0)]
102-
impl<T: Eq> Eq for Box<T> {}
103-
104-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
10568
impl<Sized? T: PartialEq> PartialEq for Box<T> {
10669
#[inline]
10770
fn eq(&self, other: &Box<T>) -> bool { PartialEq::eq(&**self, &**other) }
10871
#[inline]
10972
fn ne(&self, other: &Box<T>) -> bool { PartialEq::ne(&**self, &**other) }
11073
}
111-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
11274
impl<Sized? T: PartialOrd> PartialOrd for Box<T> {
11375
#[inline]
11476
fn partial_cmp(&self, other: &Box<T>) -> Option<Ordering> {
@@ -123,14 +85,12 @@ impl<Sized? T: PartialOrd> PartialOrd for Box<T> {
12385
#[inline]
12486
fn gt(&self, other: &Box<T>) -> bool { PartialOrd::gt(&**self, &**other) }
12587
}
126-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
12788
impl<Sized? T: Ord> Ord for Box<T> {
12889
#[inline]
12990
fn cmp(&self, other: &Box<T>) -> Ordering {
13091
Ord::cmp(&**self, &**other)
13192
}
13293
}
133-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
13494
impl<Sized? T: Eq> Eq for Box<T> {}
13595

13696
/// Extension methods for an owning `Any` trait object.

‎branches/snap-stage3/src/libcollections/str.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -534,13 +534,6 @@ impl<'a> PartialOrd for MaybeOwned<'a> {
534534
}
535535

536536
impl<'a> Ord for MaybeOwned<'a> {
537-
// NOTE(stage0): remove method after a snapshot
538-
#[cfg(stage0)]
539-
#[inline]
540-
fn cmp(&self, other: &MaybeOwned) -> Ordering {
541-
self.as_slice().cmp(&other.as_slice())
542-
}
543-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
544537
#[inline]
545538
fn cmp(&self, other: &MaybeOwned) -> Ordering {
546539
self.as_slice().cmp(other.as_slice())

‎branches/snap-stage3/src/libcollections/vec.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -506,13 +506,6 @@ impl<T: PartialEq> PartialEq for Vec<T> {
506506

507507
#[unstable = "waiting on PartialOrd stability"]
508508
impl<T: PartialOrd> PartialOrd for Vec<T> {
509-
// NOTE(stage0): remove method after a snapshot
510-
#[cfg(stage0)]
511-
#[inline]
512-
fn partial_cmp(&self, other: &Vec<T>) -> Option<Ordering> {
513-
self.as_slice().partial_cmp(&other.as_slice())
514-
}
515-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
516509
#[inline]
517510
fn partial_cmp(&self, other: &Vec<T>) -> Option<Ordering> {
518511
self.as_slice().partial_cmp(other.as_slice())
@@ -530,13 +523,6 @@ impl<T: PartialEq, V: AsSlice<T>> Equiv<V> for Vec<T> {
530523

531524
#[unstable = "waiting on Ord stability"]
532525
impl<T: Ord> Ord for Vec<T> {
533-
// NOTE(stage0): remove method after a snapshot
534-
#[cfg(stage0)]
535-
#[inline]
536-
fn cmp(&self, other: &Vec<T>) -> Ordering {
537-
self.as_slice().cmp(&other.as_slice())
538-
}
539-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
540526
#[inline]
541527
fn cmp(&self, other: &Vec<T>) -> Ordering {
542528
self.as_slice().cmp(other.as_slice())

0 commit comments

Comments
 (0)