Skip to content

Commit f1d6183

Browse files
committedNov 13, 2018
Auto merge of #55912 - kennytm:rollup, r=kennytm
Rollup of 20 pull requests Successful merges: - #55136 (Remove short doc where it starts with a codeblock) - #55711 (Format BtreeMap::range_mut example) - #55722 (impl_stable_hash_for: support enums and tuple structs with generic parameters) - #55754 (Avoid converting bytes to UTF-8 strings to print, just pass bytes to stdout/err) - #55804 (rustdoc: don't inline `pub use some_crate` unless directly asked to) - #55805 (Move `static_assert!` into librustc_data_structures) - #55837 (Make PhantomData #[structural_match]) - #55840 (Fix TLS errors when downloading stage0) - #55843 (add FromIterator<A> to Box<[A]>) - #55858 (Small fixes on code blocks in rustdoc) - #55863 (Fix a typo in std::panic) - #55870 (Fix typos.) - #55874 (string: Add documentation for `From` impls) - #55879 (save-analysis: Don't panic for macro-generated use globs) - #55882 (Reference count `crate_inherent_impls`s return value.) - #55888 (miri: for uniformity, also move memory_deallocated to AllocationExtra) - #55889 (global allocators: add a few comments) - #55896 (Document optimizations enabled by FusedIterator) - #55905 (Change `Lit::short_name` to `Lit::literal_name`.) - #55908 (Fix their/there grammar nit)
2 parents 9fefb67 + 7921572 commit f1d6183

File tree

62 files changed

+603
-509
lines changed

Some content is hidden

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

62 files changed

+603
-509
lines changed
 

‎src/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This directory contains the source code of the rust project, including:
55

66
For more information on how various parts of the compiler work, see the [rustc guide].
77

8-
Their is also useful content in the following READMEs, which are gradually being moved over to the guide:
8+
There is also useful content in the following READMEs, which are gradually being moved over to the guide:
99
- https://github.com/rust-lang/rust/tree/master/src/librustc/ty/query
1010
- https://github.com/rust-lang/rust/tree/master/src/librustc/dep_graph
1111
- https://github.com/rust-lang/rust/blob/master/src/librustc/infer/region_constraints

‎src/bootstrap/bootstrap.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ def _download(path, url, probably_big, verbose, exception):
7979
# see http://serverfault.com/questions/301128/how-to-download
8080
if sys.platform == 'win32':
8181
run(["PowerShell.exe", "/nologo", "-Command",
82-
"(New-Object System.Net.WebClient)"
83-
".DownloadFile('{}', '{}')".format(url, path)],
82+
"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;",
83+
"(New-Object System.Net.WebClient).DownloadFile('{}', '{}')".format(url, path)],
8484
verbose=verbose,
8585
exception=exception)
8686
else:

0 commit comments

Comments
 (0)