Rolling up PRs in the queue

CONTRIBUTING.md

@@ -17,8 +17,8 @@ hop on [#rust-internals][pound-rust-internals].
 As a reminder, all contributors are expected to follow our [Code of Conduct][coc].
 
 [pound-rust-internals]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-internals
-[internals]: http://internals.rust-lang.org
-[coc]: http://www.rust-lang.org/conduct.html
+[internals]: https://internals.rust-lang.org
+[coc]: https://www.rust-lang.org/conduct.html
 
 ## Feature Requests
 
@@ -207,6 +207,6 @@ it to [Crates.io](http://crates.io). Easier said than done, but very, very
 valuable!
 
 [pound-rust]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust
-[users]: http://users.rust-lang.org/
+[users]: https://users.rust-lang.org/
 [so]: http://stackoverflow.com/questions/tagged/rust
 [community-library]: https://github.com/rust-lang/rfcs/labels/A-community-library

README.md

@@ -13,8 +13,8 @@ as standard libraries, tools and documentation for Rust.
 
 Read ["Installing Rust"] from [The Book].
 
-["Installing Rust"]: http://doc.rust-lang.org/book/installing-rust.html
-[The Book]: http://doc.rust-lang.org/book/index.html
+["Installing Rust"]: https://doc.rust-lang.org/book/installing-rust.html
+[The Book]: https://doc.rust-lang.org/book/index.html
 
 ## Building from Source
 
@@ -117,7 +117,7 @@ The Rust community congregates in a few places:
 
 [Stack Overflow]: http://stackoverflow.com/questions/tagged/rust
 [/r/rust]: http://reddit.com/r/rust
-[users.rust-lang.org]: http://users.rust-lang.org/
+[users.rust-lang.org]: https://users.rust-lang.org/
 
 ## Contributing
 

RELEASES.md

@@ -102,51 +102,51 @@ Misc
 * Fat pointers are now [passed in pairs of immediate arguments][fat],
   resulting in faster compile times and smaller code.
 
-[`Extend`]: http://doc.rust-lang.org/nightly/std/iter/trait.Extend.html
+[`Extend`]: https://doc.rust-lang.org/nightly/std/iter/trait.Extend.html
 [extend-rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0839-embrace-extend-extinguish.md
-[`iter::once`]: http://doc.rust-lang.org/nightly/std/iter/fn.once.html
-[`iter::empty`]: http://doc.rust-lang.org/nightly/std/iter/fn.empty.html
-[`matches`]: http://doc.rust-lang.org/nightly/std/primitive.str.html#method.matches
-[`rmatches`]: http://doc.rust-lang.org/nightly/std/primitive.str.html#method.rmatches
-[`Cell`]: http://doc.rust-lang.org/nightly/std/cell/struct.Cell.html
-[`RefCell`]: http://doc.rust-lang.org/nightly/std/cell/struct.RefCell.html
-[`wrapping_add`]: http://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_add
-[`wrapping_sub`]: http://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_sub
-[`wrapping_mul`]: http://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_mul
-[`wrapping_div`]: http://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_div
-[`wrapping_rem`]: http://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_rem
-[`wrapping_neg`]: http://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_neg
-[`wrapping_shl`]: http://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_shl
-[`wrapping_shr`]: http://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_shr
-[`Wrapping`]: http://doc.rust-lang.org/nightly/std/num/struct.Wrapping.html
-[`fmt::Formatter`]: http://doc.rust-lang.org/nightly/std/fmt/struct.Formatter.html
-[`fmt::Write`]: http://doc.rust-lang.org/nightly/std/fmt/trait.Write.html
-[`io::Write`]: http://doc.rust-lang.org/nightly/std/io/trait.Write.html
-[`debug_struct`]: http://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_struct
-[`debug_tuple`]: http://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_tuple
-[`debug_list`]: http://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_list
-[`debug_set`]: http://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_set
-[`debug_map`]: http://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_map
-[`Debug`]: http://doc.rust-lang.org/nightly/std/fmt/trait.Debug.html
-[strup]: http://doc.rust-lang.org/nightly/std/primitive.str.html#method.to_uppercase
-[strlow]: http://doc.rust-lang.org/nightly/std/primitive.str.html#method.to_lowercase
-[`to_uppercase`]: http://doc.rust-lang.org/nightly/std/primitive.char.html#method.to_uppercase
-[`to_lowercase`]: http://doc.rust-lang.org/nightly/std/primitive.char.html#method.to_lowercase
-[`PoisonError`]: http://doc.rust-lang.org/nightly/std/sync/struct.PoisonError.html
-[`RwLock`]: http://doc.rust-lang.org/nightly/std/sync/struct.RwLock.html
-[`Mutex`]: http://doc.rust-lang.org/nightly/std/sync/struct.Mutex.html
-[`FromRawFd`]: http://doc.rust-lang.org/nightly/std/os/unix/io/trait.FromRawFd.html
-[`AsRawFd`]: http://doc.rust-lang.org/nightly/std/os/unix/io/trait.AsRawFd.html
-[`Stdio`]: http://doc.rust-lang.org/nightly/std/process/struct.Stdio.html
-[`ChildStdin`]: http://doc.rust-lang.org/nightly/std/process/struct.ChildStdin.html
-[`ChildStdout`]: http://doc.rust-lang.org/nightly/std/process/struct.ChildStdout.html
-[`ChildStderr`]: http://doc.rust-lang.org/nightly/std/process/struct.ChildStderr.html
-[`io::ErrorKind`]: http://doc.rust-lang.org/nightly/std/io/enum.ErrorKind.html
+[`iter::once`]: https://doc.rust-lang.org/nightly/std/iter/fn.once.html
+[`iter::empty`]: https://doc.rust-lang.org/nightly/std/iter/fn.empty.html
+[`matches`]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.matches
+[`rmatches`]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.rmatches
+[`Cell`]: https://doc.rust-lang.org/nightly/std/cell/struct.Cell.html
+[`RefCell`]: https://doc.rust-lang.org/nightly/std/cell/struct.RefCell.html
+[`wrapping_add`]: https://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_add
+[`wrapping_sub`]: https://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_sub
+[`wrapping_mul`]: https://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_mul
+[`wrapping_div`]: https://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_div
+[`wrapping_rem`]: https://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_rem
+[`wrapping_neg`]: https://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_neg
+[`wrapping_shl`]: https://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_shl
+[`wrapping_shr`]: https://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_shr
+[`Wrapping`]: https://doc.rust-lang.org/nightly/std/num/struct.Wrapping.html
+[`fmt::Formatter`]: https://doc.rust-lang.org/nightly/std/fmt/struct.Formatter.html
+[`fmt::Write`]: https://doc.rust-lang.org/nightly/std/fmt/trait.Write.html
+[`io::Write`]: https://doc.rust-lang.org/nightly/std/io/trait.Write.html
+[`debug_struct`]: https://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_struct
+[`debug_tuple`]: https://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_tuple
+[`debug_list`]: https://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_list
+[`debug_set`]: https://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_set
+[`debug_map`]: https://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_map
+[`Debug`]: https://doc.rust-lang.org/nightly/std/fmt/trait.Debug.html
+[strup]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.to_uppercase
+[strlow]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.to_lowercase
+[`to_uppercase`]: https://doc.rust-lang.org/nightly/std/primitive.char.html#method.to_uppercase
+[`to_lowercase`]: https://doc.rust-lang.org/nightly/std/primitive.char.html#method.to_lowercase
+[`PoisonError`]: https://doc.rust-lang.org/nightly/std/sync/struct.PoisonError.html
+[`RwLock`]: https://doc.rust-lang.org/nightly/std/sync/struct.RwLock.html
+[`Mutex`]: https://doc.rust-lang.org/nightly/std/sync/struct.Mutex.html
+[`FromRawFd`]: https://doc.rust-lang.org/nightly/std/os/unix/io/trait.FromRawFd.html
+[`AsRawFd`]: https://doc.rust-lang.org/nightly/std/os/unix/io/trait.AsRawFd.html
+[`Stdio`]: https://doc.rust-lang.org/nightly/std/process/struct.Stdio.html
+[`ChildStdin`]: https://doc.rust-lang.org/nightly/std/process/struct.ChildStdin.html
+[`ChildStdout`]: https://doc.rust-lang.org/nightly/std/process/struct.ChildStdout.html
+[`ChildStderr`]: https://doc.rust-lang.org/nightly/std/process/struct.ChildStderr.html
+[`io::ErrorKind`]: https://doc.rust-lang.org/nightly/std/io/enum.ErrorKind.html
 [debugfmt]: https://www.reddit.com/r/rust/comments/3ceaui/psa_produces_prettyprinted_debug_output/
-[`DerefMut`]: http://doc.rust-lang.org/nightly/std/ops/trait.DerefMut.html
-[`mem::align_of`]: http://doc.rust-lang.org/nightly/std/mem/fn.align_of.html
+[`DerefMut`]: https://doc.rust-lang.org/nightly/std/ops/trait.DerefMut.html
+[`mem::align_of`]: https://doc.rust-lang.org/nightly/std/mem/fn.align_of.html
 [align]: https://github.com/rust-lang/rust/pull/25646
-[`mem::min_align_of`]: http://doc.rust-lang.org/nightly/std/mem/fn.min_align_of.html
+[`mem::min_align_of`]: https://doc.rust-lang.org/nightly/std/mem/fn.min_align_of.html
 [typos]: https://github.com/rust-lang/rust/pull/26087
 [nop]: https://github.com/rust-lang/rust/pull/26336
 [fat]: https://github.com/rust-lang/rust/pull/26411
@@ -237,14 +237,14 @@ Misc
 * [The `drop_with_repr_extern` lint warns about mixing `repr(C)`
   with `Drop`][drop].
 
-[`str::split_whitespace`]: http://doc.rust-lang.org/nightly/std/primitive.str.html#method.split_whitespace
-[`FromRawFd`]: http://doc.rust-lang.org/nightly/std/os/unix/io/trait.FromRawFd.html
-[`AsRawFd`]: http://doc.rust-lang.org/nightly/std/os/unix/io/trait.AsRawFd.html
-[`std::os::unix::symlink`]: http://doc.rust-lang.org/nightly/std/os/unix/fs/fn.symlink.html
-[`IntoIterator`]: http://doc.rust-lang.org/nightly/std/iter/trait.IntoIterator.html
-[`From`]: http://doc.rust-lang.org/nightly/std/convert/trait.From.html
+[`str::split_whitespace`]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.split_whitespace
+[`FromRawFd`]: https://doc.rust-lang.org/nightly/std/os/unix/io/trait.FromRawFd.html
+[`AsRawFd`]: https://doc.rust-lang.org/nightly/std/os/unix/io/trait.AsRawFd.html
+[`std::os::unix::symlink`]: https://doc.rust-lang.org/nightly/std/os/unix/fs/fn.symlink.html
+[`IntoIterator`]: https://doc.rust-lang.org/nightly/std/iter/trait.IntoIterator.html
+[`From`]: https://doc.rust-lang.org/nightly/std/convert/trait.From.html
 [rf]: https://github.com/rust-lang/rust/pull/24491
-[err-index]: http://doc.rust-lang.org/error-index.html
+[err-index]: https://doc.rust-lang.org/error-index.html
 [sk]: https://github.com/rust-lang/rust/pull/24615
 [pre]: https://github.com/rust-lang/rust/pull/25323
 [file]: https://github.com/rust-lang/rust/pull/24598
@@ -258,13 +258,13 @@ Misc
 [pie]: https://github.com/rust-lang/rust/pull/24953
 [abs]: https://github.com/rust-lang/rust/pull/25441
 [c]: https://github.com/rust-lang/rust/pull/25496
-[`Cloned`]: http://doc.rust-lang.org/nightly/std/iter/struct.Cloned.html
-[`Incoming`]: http://doc.rust-lang.org/nightly/std/net/struct.Incoming.html
+[`Cloned`]: https://doc.rust-lang.org/nightly/std/iter/struct.Cloned.html
+[`Incoming`]: https://doc.rust-lang.org/nightly/std/net/struct.Incoming.html
 [inc]: https://github.com/rust-lang/rust/pull/25522
 [bh]: https://github.com/rust-lang/rust/pull/25856
-[`BinaryHeap`]: http://doc.rust-lang.org/nightly/std/collections/struct.BinaryHeap.html
+[`BinaryHeap`]: https://doc.rust-lang.org/nightly/std/collections/struct.BinaryHeap.html
 [ll]: https://github.com/rust-lang/rust/pull/26022
-[`split_off`]: http://doc.rust-lang.org/nightly/collections/linked_list/struct.LinkedList.html#method.split_off
+[`split_off`]: https://doc.rust-lang.org/nightly/collections/linked_list/struct.LinkedList.html#method.split_off
 [drop]: https://github.com/rust-lang/rust/pull/24935
 
 Version 1.0.0 (May 2015)
@@ -508,7 +508,7 @@ Version 1.0.0-alpha.2 (February 2015)
 [drop]: https://github.com/rust-lang/rust/pull/21972
 [drop-rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0769-sound-generic-drop.md
 [feat]: https://github.com/rust-lang/rust/pull/21248
-[feat-forum]: http://users.rust-lang.org/t/psa-important-info-about-rustcs-new-feature-staging/82/5
+[feat-forum]: https://users.rust-lang.org/t/psa-important-info-about-rustcs-new-feature-staging/82/5
 [feat-rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0507-release-channels.md
 [fmt]: https://github.com/rust-lang/rust/pull/21457
 [into]: https://github.com/rust-lang/rust/pull/20790
@@ -709,7 +709,7 @@ Version 1.0.0-alpha (January 2015)
 [objsafe]: https://github.com/rust-lang/rfcs/blob/master/text/0255-object-safety.md
 [assoc]: https://github.com/rust-lang/rfcs/blob/master/text/0195-associated-items.md
 [ints]: https://github.com/rust-lang/rfcs/pull/544#issuecomment-68760871
-[trpl]: http://doc.rust-lang.org/book/index.html
+[trpl]: https://doc.rust-lang.org/book/index.html
 [rbe]: http://rustbyexample.com/
 
 

configure

@@ -1428,9 +1428,10 @@ do
         LLVM_BUILD_DIR=
         LLVM_INST_DIR=$CFG_LLVM_ROOT
         do_reconfigure=0
+        # Check that LLVm FileCheck is available. Needed for the tests
+        need_cmd $LLVM_INST_DIR/bin/FileCheck
     fi
 
-
     if [ ${do_reconfigure} -ne 0 ]
     then
     # because git is hilarious, it might have put the module index

mk/cfg/i686-pc-windows-msvc.mk

@@ -22,8 +22,3 @@ CFG_LDPATH_i686-pc-windows-msvc :=
 CFG_RUN_i686-pc-windows-msvc=$(2)
 CFG_RUN_TARG_i686-pc-windows-msvc=$(call CFG_RUN_i686-pc-windows-msvc,,$(2))
 CFG_GNU_TRIPLE_i686-pc-windows-msvc := i686-pc-win32
-
-# All windows nightiles are currently a GNU triple, so this MSVC triple is not
-# bootstrapping from itself. This is relevant during stage0, and other parts of
-# the build system take this into account.
-BOOTSTRAP_FROM_i686-pc-windows-msvc := i686-pc-windows-gnu

mk/cfg/x86_64-pc-windows-msvc.mk

@@ -22,8 +22,3 @@ CFG_LDPATH_x86_64-pc-windows-msvc :=
 CFG_RUN_x86_64-pc-windows-msvc=$(2)
 CFG_RUN_TARG_x86_64-pc-windows-msvc=$(call CFG_RUN_x86_64-pc-windows-msvc,,$(2))
 CFG_GNU_TRIPLE_x86_64-pc-windows-msvc := x86_64-pc-win32
-
-# All windows nightiles are currently a GNU triple, so this MSVC triple is not
-# bootstrapping from itself. This is relevant during stage0, and other parts of
-# the build system take this into account.
-BOOTSTRAP_FROM_x86_64-pc-windows-msvc := x86_64-pc-windows-gnu

mk/docs.mk

@@ -48,7 +48,7 @@ L10N_LANGS := ja
 RUSTDOC_HTML_OPTS_NO_CSS = --html-before-content=doc/version_info.html \
 	--html-in-header=doc/favicon.inc \
 	--html-after-content=doc/footer.inc \
-	--markdown-playground-url='http://play.rust-lang.org/'
+	--markdown-playground-url='https://play.rust-lang.org/'
 
 RUSTDOC_HTML_OPTS = $(RUSTDOC_HTML_OPTS_NO_CSS) --markdown-css rust.css
 
@@ -169,7 +169,7 @@ doc/not_found.html: $(D)/not_found.md $(HTML_DEPS) | doc/
 	@$(call E, rustdoc: $@)
 	$(Q)$(RUSTDOC) $(RUSTDOC_HTML_OPTS_NO_CSS) \
 		--markdown-no-toc \
-		--markdown-css http://doc.rust-lang.org/rust.css $<
+		--markdown-css https://doc.rust-lang.org/rust.css $<
 
 define DEF_DOC
 

mk/main.mk

@@ -400,11 +400,6 @@ TSREQ$(1)_T_$(2)_H_$(3) = \
 	$$(foreach obj,$$(INSTALLED_OBJECTS_$(2)),\
 		$$(TLIB$(1)_T_$(2)_H_$(3))/$$(obj))
 
-ifeq ($(1),0)
-TSREQ$(1)_T_$(2)_H_$(3) += \
-	$$(TLIB$(1)_T_$(2)_H_$(3))/$$(call CFG_STATIC_LIB_NAME_$(2),morestack)
-endif
-
 # Prerequisites for a working stageN compiler and libraries, for a specific
 # target
 SREQ$(1)_T_$(2)_H_$(3) = \

mk/platform.mk

@@ -237,64 +237,3 @@ endef
 
 $(foreach target,$(CFG_TARGET), \
   $(eval $(call CFG_MAKE_TOOLCHAIN,$(target))))
-
-# There are more comments about this available in the target specification for
-# Windows MSVC in the compiler, but the gist of it is that we use `llvm-ar.exe`
-# instead of `lib.exe` for assembling archives, so we need to inject this custom
-# dependency here.
-#
-# FIXME(stage0): remove this and all other relevant support in the makefiles
-#                after a snapshot is made
-define ADD_LLVM_AR_TO_MSVC_DEPS
-ifeq ($$(findstring msvc,$(1)),msvc)
-NATIVE_TOOL_DEPS_core_T_$(1) += llvm-ar.exe
-INSTALLED_BINS_$(1) += llvm-ar.exe
-endif
-endef
-
-$(foreach target,$(CFG_TARGET), \
-  $(eval $(call ADD_LLVM_AR_TO_MSVC_DEPS,$(target))))
-
-# When working with MSVC on windows, each DLL needs to explicitly declare its
-# interface to the outside world through some means. The options for doing so
-# include:
-#
-# 1. A custom attribute on each function itself
-# 2. A linker argument saying what to export
-# 3. A file which lists all symbols that need to be exported
-#
-# The Rust compiler takes care (1) for us for all Rust code by annotating all
-# public-facing functions with dllexport, but we have a few native dependencies
-# which need to cross the DLL boundary. The most important of these dependencies
-# is LLVM which is linked into `rustc_llvm.dll` but primarily used from
-# `rustc_trans.dll`. This means that many of LLVM's C API functions need to be
-# exposed from `rustc_llvm.dll` to be forwarded over the boundary.
-#
-# Unfortunately, at this time, LLVM does not handle this sort of exportation on
-# Windows for us, so we're forced to do it ourselves if we want it (which seems
-# like the path of least resistance right now). To do this we generate a `.DEF`
-# file [1] which we then custom-pass to the linker when building the rustc_llvm
-# crate. This DEF file list all symbols that are exported from
-# `src/librustc_llvm/lib.rs` and is generated by a small python script.
-#
-# Fun times!
-#
-# [1]: https://msdn.microsoft.com/en-us/library/28d6s79h.aspx
-#
-# FIXME(stage0): remove this macro and the usage below (and the commments above)
-# 	         when a new snapshot is available. Also remove the
-# 	         RUSTFLAGS$(1)_.._T_ variable in mk/target.mk along with
-# 	         CUSTOM_DEPS (as they were only added for this)
-define ADD_RUSTC_LLVM_DEF_TO_MSVC
-ifeq ($$(findstring msvc,$(1)),msvc)
-RUSTFLAGS0_rustc_llvm_T_$(1) += -C link-args="-DEF:$(1)/rt/rustc_llvm.def"
-CUSTOM_DEPS0_rustc_llvm_T_$(1) += $(1)/rt/rustc_llvm.def
-
-$(1)/rt/rustc_llvm.def: $$(S)src/etc/mklldef.py $$(S)src/librustc_llvm/lib.rs
-	$$(CFG_PYTHON) $$^ $$@ rustc_llvm-$$(CFG_FILENAME_EXTRA)
-endif
-endef
-
-$(foreach target,$(CFG_TARGET), \
-  $(eval $(call ADD_RUSTC_LLVM_DEF_TO_MSVC,$(target))))
-

mk/rt.mk

@@ -35,8 +35,7 @@
 # that's per-target so you're allowed to conditionally add files based on the
 # target.
 ################################################################################
-NATIVE_LIBS := rust_builtin hoedown miniz \
-		rust_test_helpers morestack
+NATIVE_LIBS := rust_builtin hoedown miniz rust_test_helpers
 
 # $(1) is the target triple
 define NATIVE_LIBRARIES
@@ -54,7 +53,6 @@ NATIVE_DEPS_miniz_$(1) = miniz.c
 NATIVE_DEPS_rust_builtin_$(1) := rust_builtin.c \
 			rust_android_dummy.c
 NATIVE_DEPS_rust_test_helpers_$(1) := rust_test_helpers.c
-NATIVE_DEPS_morestack_$(1) := empty.c
 
 ################################################################################
 # You shouldn't find it that necessary to edit anything below this line.