Skip to content

Commit 34b8047

Browse files
jeffparsonsjeffparsons
committed
---
yaml --- r: 159287 b: refs/heads/master c: 2df9a08 h: refs/heads/master i: 159285: 9b2a627 159283: c5f5469 159279: f735b08 v: v3
1 parent 5da5aa0 commit 34b8047

Some content is hidden

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

66 files changed

+496
-1047
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: e82f60eb471c4ee092bd4867f6946d271a620e71
2+
refs/heads/master: 2df9a085bd904dae7786a6c5d30e4a4057a16f22
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 9c96a79a74f10bed18b031ce0ac4126c56d6cfb3
55
refs/heads/try: f58aad6dce273570fb130b4df008ef9acd5a5be2

‎trunk/mk/dist.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ $(PKG_EXE): rust.iss modpath.iss upgrade.iss LICENSE.txt rust-logo.ico \
125125
dist-prepare-win
126126
$(CFG_PYTHON) $(S)src/etc/make-win-dist.py tmp/dist/win $(CFG_BUILD)
127127
@$(call E, ISCC: $@)
128-
$(Q)$(CFG_ISCC) $<
128+
$(Q)"$(CFG_ISCC)" $<
129129

130130
$(eval $(call DEF_PREPARE,win))
131131

‎trunk/mk/main.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ CFG_GIT_DIR := $(CFG_SRC_DIR).git
5252
# so we use a hack: define $(SPACE) which contains space character.
5353
SPACE :=
5454
SPACE +=
55-
ifneq ($(CFG_GIT),)
55+
ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT))),)
5656
ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT_DIR))),)
5757
CFG_VER_DATE = $(shell git --git-dir='$(CFG_GIT_DIR)' log -1 --pretty=format:'%ci')
5858
CFG_VER_HASH = $(shell git --git-dir='$(CFG_GIT_DIR)' rev-parse HEAD)

‎trunk/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

‎trunk/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" "move" "mut"
179+
"match" "mod" "mut"
180180
"priv" "proc" "pub"
181181
"ref" "return"
182182
"self" "static" "struct" "super"

‎trunk/src/etc/kate/rust.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<item> loop </item>
3535
<item> match </item>
3636
<item> mod </item>
37-
<item> move </item>
3837
<item> mut </item>
3938
<item> priv </item>
4039
<item> pub </item>

‎trunk/src/etc/make-win-dist.py

Lines changed: 8 additions & 45 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,48 +42,11 @@ def make_win_dist(dist_root, target_triple):
4242
else:
4343
rustc_dlls.append("libgcc_s_seh-1.dll")
4444

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-
]
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"]
8750

8851
# Find mingw artifacts we want to bundle
8952
target_tools = find_files(target_tools, bin_path)
@@ -96,14 +59,14 @@ def make_win_dist(dist_root, target_triple):
9659
shutil.copy(src, dist_bin_dir)
9760

9861
# Copy platform tools to platform-specific bin directory
99-
target_bin_dir = os.path.join(dist_root, "bin", "rustlib", target_triple, "bin")
62+
target_bin_dir = os.path.join(dist_root, "bin", "rustlib", target_triple, "gcc", "bin")
10063
if not os.path.exists(target_bin_dir):
10164
os.makedirs(target_bin_dir)
10265
for src in target_tools:
10366
shutil.copy(src, target_bin_dir)
10467

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

‎trunk/src/etc/vim/syntax/rust.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ syn keyword rustKeyword box nextgroup=rustBoxPlacement skipwhite skipempty
2323
syn keyword rustKeyword continue
2424
syn keyword rustKeyword extern nextgroup=rustExternCrate,rustObsoleteExternMod skipwhite skipempty
2525
syn keyword rustKeyword fn nextgroup=rustFuncName skipwhite skipempty
26-
syn keyword rustKeyword for in if impl let
26+
syn keyword rustKeyword for in if impl let move
2727
syn keyword rustKeyword loop once proc pub
2828
syn keyword rustKeyword return super
2929
syn keyword rustKeyword unsafe virtual where while
3030
syn keyword rustKeyword use nextgroup=rustModPath skipwhite skipempty
3131
" FIXME: Scoped impl's name is also fallen in this category
3232
syn keyword rustKeyword mod trait struct enum type nextgroup=rustIdentifier skipwhite skipempty
33-
syn keyword rustStorage move mut ref static const
33+
syn keyword rustStorage mut ref static const
3434

3535
syn keyword rustInvalidBareKeyword crate
3636

‎trunk/src/libcollections/enum_set.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ mod test {
486486
unsafe { mem::transmute(v) }
487487
}
488488
}
489-
let mut set = EnumSet::new();
490-
set.insert(V64);
489+
let mut set = EnumSet::empty();
490+
set.add(V64);
491491
}
492492
}

0 commit comments

Comments
 (0)