Skip to content

Commit 98282c0

Browse files
committedAug 14, 2019
Auto merge of #63544 - Centril:rollup-qhqfcov, r=Centril
Rollup of 17 pull requests Successful merges: - #62760 (Deduplicate error messages in `librsctc_mir`) - #62849 (typeck: Prohibit RPIT types that inherit lifetimes) - #63383 (`async fn` lifetime elision tests) - #63421 (Implement Clone, Display for ascii::EscapeDefault) - #63459 (syntax: account for CVarArgs being in the argument list.) - #63475 (Bring back suggestion for splitting `<-` into `< -`) - #63485 (ci: move mirrors to their standalone bucket) - #63486 (Document `From` trait for `BinaryHeap`) - #63488 (improve DiagnosticBuilder docs) - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs) - #63499 (handle elision in async fn correctly) - #63501 (use `ParamName` to track in-scope lifetimes instead of Ident) - #63508 (Do not ICE when synthesizing spans falling inside unicode chars) - #63511 (ci: add a check for clock drift) - #63512 (Provide map_ok and map_err method for Poll<Option<Result<T, E>>>) - #63529 (RELEASES.md: ? is one of three Kleene operators) - #63530 (Fix typo in error message.) Failed merges: r? @ghost
2 parents 60960a2 + a8bb375 commit 98282c0

File tree

89 files changed

+2462
-193
lines changed

Some content is hidden

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

89 files changed

+2462
-193
lines changed
 

‎RELEASES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Language
2222
- [You can now use `_` as an identifier for consts.][61347] e.g. You can write
2323
`const _: u32 = 5;`.
2424
- [You can now use `#[repr(align(X)]` on enums.][61229]
25-
- [The `?`/_"Kleene"_ macro operator is now available in the
25+
- [The `?` Kleene macro operator is now available in the
2626
2015 edition.][60932]
2727

2828
Compiler

‎src/ci/azure-pipelines/auto.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ jobs:
273273
MSYS_BITS: 32
274274
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
275275
SCRIPT: make ci-subset-1
276-
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
276+
MINGW_URL: https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc
277277
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
278278
MINGW_DIR: mingw32
279279
# FIXME(#59637)
@@ -283,14 +283,14 @@ jobs:
283283
MSYS_BITS: 32
284284
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
285285
SCRIPT: make ci-subset-2
286-
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
286+
MINGW_URL: https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc
287287
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
288288
MINGW_DIR: mingw32
289289
x86_64-mingw-1:
290290
MSYS_BITS: 64
291291
SCRIPT: make ci-subset-1
292292
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
293-
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
293+
MINGW_URL: https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc
294294
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
295295
MINGW_DIR: mingw64
296296
# FIXME(#59637)
@@ -300,7 +300,7 @@ jobs:
300300
MSYS_BITS: 64
301301
SCRIPT: make ci-subset-2
302302
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
303-
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
303+
MINGW_URL: https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc
304304
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
305305
MINGW_DIR: mingw64
306306

@@ -327,7 +327,7 @@ jobs:
327327
MSYS_BITS: 32
328328
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler
329329
SCRIPT: python x.py dist
330-
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
330+
MINGW_URL: https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc
331331
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
332332
MINGW_DIR: mingw32
333333
DIST_REQUIRE_ALL_TOOLS: 1
@@ -336,7 +336,7 @@ jobs:
336336
MSYS_BITS: 64
337337
SCRIPT: python x.py dist
338338
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler
339-
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
339+
MINGW_URL: https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc
340340
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
341341
MINGW_DIR: mingw64
342342
DIST_REQUIRE_ALL_TOOLS: 1

0 commit comments

Comments
 (0)