Bump to 1.22.0 and update boostrap compiler #44154

alexcrichton · 2017-08-29T14:49:52Z

Time to get a new nightly!

kennytm · 2017-08-29T16:43:13Z

src/libcore/array.rs

-                fn clone(&self) -> [T; $N] {
-                    *self
-                }
-            }


Oh. This is going to make the reversal at #44045 more difficult (if the decision turns out to be "not close").

kennytm · 2017-08-29T16:45:59Z

src/libstd/lib.rs

@@ -323,13 +323,9 @@
 // `force_alloc_system` is *only* intended as a workaround for local rebuilds
 // with a rustc without jemalloc.
 // The not(stage0+msvc) gates will only last until the next stage0 bump


This comment can be deleted

steveklabnik · 2017-08-29T16:54:39Z

@alexcrichton https://github.com/azerupi/mdBook/releases/tag/0.0.23

alexcrichton · 2017-08-29T17:39:28Z

r? @Mark-Simulacrum

Mark-Simulacrum · 2017-08-29T17:43:52Z

Aside from the concern raised by @kennytm (#44154 (comment)) r=me.

alexcrichton · 2017-08-29T17:57:25Z

Ok the current disposition is to close so it sounds like there's not going to be need for a revert, and if so I'll volunteer to do the revert myself.

@bors: r=Mark-Simulacrum

bors · 2017-08-29T17:57:25Z

📌 Commit 1768563 has been approved by Mark-Simulacrum

aidanhs · 2017-08-29T18:44:28Z

src/libstd/lib.rs

@@ -320,16 +320,9 @@
 // Always use alloc_system during stage0 since we don't know if the alloc_*
 // crate the stage0 compiler will pick by default is enabled (e.g.
 // if the user has disabled jemalloc in `./configure`).
-// `force_alloc_system` is *only* intended as a workaround for local rebuilds
-// with a rustc without jemalloc.


Please leave this comment in! Though if you feel like it, it could be corrected to "...for local rebuilds using a rustc with jemalloc to create a rustc without jemalloc."

Just to clarify my previous comment, only the // The not(stage0+msvc) gates will only last until the next stage0 bump line should be deleted 🙂

aidanhs · 2017-08-29T18:45:24Z

@bors r-

since

[00:35:28] error[E0599]: no method named `set_dest` found for type `mdbook::MDBook` in the current scope
[00:35:28]   --> /checkout/src/tools/rustbook/src/main.rs:59:32
[00:35:28]    |
[00:35:28] 59 |         Some(dest_dir) => book.set_dest(Path::new(dest_dir)),

and other bits and pieces

alexcrichton · 2017-08-29T22:30:06Z

@bors: r=Mark-Simulacrum

bors · 2017-08-29T22:30:07Z

📌 Commit 45d7224 has been approved by Mark-Simulacrum

alexcrichton · 2017-08-29T23:27:09Z

@bors: r=Mark-Simulacrum

bors · 2017-08-29T23:27:09Z

📌 Commit 076485f has been approved by Mark-Simulacrum

kennytm · 2017-08-30T08:17:36Z

cc #43975 (that PR depends on it)

steveklabnik · 2017-08-30T22:04:53Z

Given this has been sitting for almost a day, and some other PRs depend on it, and IIRC we need it for a nightly...

@bors: p=1

steveklabnik · 2017-08-30T22:05:30Z

Oh wait, this is in the rollup. My bad! Not that it harms anything.

Rollup of 8 pull requests - Successful merges: #44044, #44089, #44116, #44125, #44154, #44157, #44160, #44172 - Failed merges: #44162

bors · 2017-08-31T03:54:06Z

⌛ Testing commit 076485f with merge 8368ca641567e6d41f7e22b406c1ba86e74c80c6...

alexcrichton · 2017-08-31T14:08:26Z

@bors: r=Mark-Simulacrum

bors · 2017-08-31T14:08:27Z

📌 Commit 678f6da has been approved by Mark-Simulacrum

kennytm · 2017-08-31T14:46:23Z

@alexcrichton 678f6da failed the CI with tidy error.

[00:03:09] tidy error: /checkout/src/libstd/lib.rs:330: platform-specific cfg: cfg(all(
[00:03:09]     not(all(stage0, target_env = "msvc")),
[00:03:09]     any(stage0, feature = "force_alloc_system")))
[00:03:09] some tidy checks failed

alexcrichton · 2017-08-31T15:10:06Z

Simulacrum

alexcrichton · 2017-08-31T15:10:09Z

@bors: r=Mark-Simulacrum

bors · 2017-08-31T15:10:10Z

📌 Commit 731c095 has been approved by Mark-Simulacrum

bors · 2017-08-31T15:40:42Z

⌛ Testing commit 731c09578ef8a720aa8a3fa1fdb9e988ceac2e66 with merge 57059b7a2f8739e50ac459eee4916881b279034d...

bors · 2017-08-31T15:46:26Z

💔 Test failed - status-appveyor

steveklabnik · 2017-08-31T15:52:49Z

error: linking with `link.exe` failed: exit code: 1120
  |
  = note: "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\amd64\\link.exe" "/NOLOGO" "/NXCOMPAT" "/LIBPATH:C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage0-sysroot\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib" "C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage0-test\\x86_64-pc-windows-msvc\\release\\deps\\term-91aff61c22a4f407.0.o" "/OUT:C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage0-test\\x86_64-pc-windows-msvc\\release\\deps\\term-91aff61c22a4f407.dll" "/DEF:C:\\Users\\appveyor\\AppData\\Local\\Temp\\1\\rustc.U0oBp9mzWqg8\\lib.def" "C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage0-test\\x86_64-pc-windows-msvc\\release\\deps\\term-91aff61c22a4f407.crate.metadata.o" "C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage0-test\\x86_64-pc-windows-msvc\\release\\deps\\term-91aff61c22a4f407.crate.allocator.o" "/OPT:REF,ICF" "/DEBUG" "/LIBPATH:C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage0-test\\x86_64-pc-windows-msvc\\release\\deps" "/LIBPATH:C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage0-test\\release\\deps" "/LIBPATH:C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage0-sysroot\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib" "kernel32.lib" "/LIBPATH:C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage0-sysroot\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib" "std-488c7c40c2087fcf.dll.lib" "C:\\Users\\appveyor\\AppData\\Local\\Temp\\1\\rustc.U0oBp9mzWqg8\\libcompiler_builtins-2f642fd8dbd70770.rlib" "advapi32.lib" "ws2_32.lib" "userenv.lib" "shell32.lib" "libcmt.lib" "/DLL" "/IMPLIB:C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage0-test\\x86_64-pc-windows-msvc\\release\\deps\\term-91aff61c22a4f407.dll.lib"
  = note:    Creating library C:\projects\rust\build\x86_64-pc-windows-msvc\stage0-test\x86_64-pc-windows-msvc\release\deps\term-91aff61c22a4f407.dll.lib and object C:\projects\rust\build\x86_64-pc-windows-msvc\stage0-test\x86_64-pc-windows-msvc\release\deps\term-91aff61c22a4f407.dll.exp
          term-91aff61c22a4f407.crate.allocator.o : error LNK2019: unresolved external symbol __rg_alloc referenced in function __rust_alloc
          term-91aff61c22a4f407.crate.allocator.o : error LNK2019: unresolved external symbol __rg_oom referenced in function __rust_oom
          term-91aff61c22a4f407.crate.allocator.o : error LNK2019: unresolved external symbol __rg_dealloc referenced in function __rust_dealloc
          term-91aff61c22a4f407.crate.allocator.o : error LNK2019: unresolved external symbol __rg_usable_size referenced in function __rust_usable_size
          term-91aff61c22a4f407.crate.allocator.o : error LNK2019: unresolved external symbol __rg_realloc referenced in function __rust_realloc
          term-91aff61c22a4f407.crate.allocator.o : error LNK2019: unresolved external symbol __rg_alloc_zeroed referenced in function __rust_alloc_zeroed
          term-91aff61c22a4f407.crate.allocator.o : error LNK2019: unresolved external symbol __rg_alloc_excess referenced in function __rust_alloc_excess
          term-91aff61c22a4f407.crate.allocator.o : error LNK2019: unresolved external symbol __rg_realloc_excess referenced in function __rust_realloc_excess
          term-91aff61c22a4f407.crate.allocator.o : error LNK2019: unresolved external symbol __rg_grow_in_place referenced in function __rust_grow_in_place
          term-91aff61c22a4f407.crate.allocator.o : error LNK2019: unresolved external symbol __rg_shrink_in_place referenced in function __rust_shrink_in_place
          C:\projects\rust\build\x86_64-pc-windows-msvc\stage0-test\x86_64-pc-windows-msvc\release\deps\term-91aff61c22a4f407.dll : fatal error LNK1120: 10 unresolved externals

I think there may still be bugs preventing its removal..

alexcrichton · 2017-09-01T01:21:09Z

@bors: r=Mark-Simulacrum

bors · 2017-09-01T01:21:09Z

📌 Commit 9e5a7e9 has been approved by Mark-Simulacrum

bors · 2017-09-01T07:29:08Z

⌛ Testing commit 9e5a7e9 with merge 5289948b56acb02c9ce5f202f6798e5750405092...

bors · 2017-09-01T08:46:11Z

💔 Test failed - status-travis

kennytm · 2017-09-01T09:05:15Z

dist-powerpc-linux failed when compiling cargo, legit (libgit2 version mismatch?).

[01:12:37]    Compiling git2 v0.6.7
[01:12:39] error[E0308]: mismatched types
[01:12:39]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/git2-0.6.7/src/blob.rs:117:53
[01:12:39]     |
[01:12:39] 117 |             let res = ((*self.raw).write)(self.raw, buf.as_ptr() as *const i8, buf.len());
[01:12:39]     |                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^ expected u8, found i8
[01:12:39]     |
[01:12:39]     = note: expected type `*const u8`
[01:12:39]                found type `*const i8`
[01:12:39] 
[01:12:40] error: aborting due to previous error
[01:12:40] 
[01:12:40] error: Could not compile `git2`.

alexcrichton · 2017-09-01T14:57:03Z

@bors: r=Mark-Simulacrum

bors · 2017-09-01T14:57:04Z

📌 Commit 271c63c has been approved by Mark-Simulacrum

bors · 2017-09-01T16:39:36Z

⌛ Testing commit 271c63c with merge f861b6e...

Bump to 1.22.0 and update boostrap compiler Time to get a new nightly!

bors · 2017-09-01T19:19:54Z

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing f861b6e to master...

kennytm reviewed Aug 29, 2017

View reviewed changes

alexcrichton force-pushed the bump-bootstrap branch from a994803 to 1768563 Compare August 29, 2017 17:32

rust-highfive assigned Mark-Simulacrum Aug 29, 2017

aidanhs reviewed Aug 29, 2017

View reviewed changes

arielb1 added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 29, 2017

alexcrichton force-pushed the bump-bootstrap branch 2 times, most recently from 95a6b4f to 45d7224 Compare August 29, 2017 22:30

alexcrichton force-pushed the bump-bootstrap branch from 45d7224 to 076485f Compare August 29, 2017 23:26

alexcrichton mentioned this pull request Aug 30, 2017

Rollup of 8 pull requests #44186

Merged

alexcrichton mentioned this pull request Aug 30, 2017

Deprecate several flags in rustdoc #44138

Merged

bors added a commit that referenced this pull request Aug 31, 2017

Auto merge of #44186 - alexcrichton:rollup, r=alexcrichton

890c87b

Rollup of 8 pull requests - Successful merges: #44044, #44089, #44116, #44125, #44154, #44157, #44160, #44172 - Failed merges: #44162

alexcrichton force-pushed the bump-bootstrap branch from 076485f to 678f6da Compare August 31, 2017 14:08

alexcrichton mentioned this pull request Aug 31, 2017

Remove stage0 allocator logic from MSVC in libstd #44217

Closed

alexcrichton force-pushed the bump-bootstrap branch from 678f6da to 731c095 Compare August 31, 2017 15:10

Bring back stage0 allocator logic on MSVC

9e5a7e9

I think there may still be bugs preventing its removal..

alexcrichton force-pushed the bump-bootstrap branch from 731c095 to 9e5a7e9 Compare September 1, 2017 01:20

Update git2-rs to fix cross compiles

271c63c

bors added a commit that referenced this pull request Sep 1, 2017

Auto merge of #44154 - alexcrichton:bump-bootstrap, r=Mark-Simulacrum

f861b6e

Bump to 1.22.0 and update boostrap compiler Time to get a new nightly!

bors merged commit 271c63c into rust-lang:master Sep 1, 2017

bors mentioned this pull request Sep 1, 2017

Implement Clone only for Copy types. #44196

Closed

alexcrichton deleted the bump-bootstrap branch September 1, 2017 19:28

Bump to 1.22.0 and update boostrap compiler #44154

Bump to 1.22.0 and update boostrap compiler #44154

Conversation

alexcrichton commented Aug 29, 2017

kennytm Aug 29, 2017

Choose a reason for hiding this comment

kennytm Aug 29, 2017

Choose a reason for hiding this comment

steveklabnik commented Aug 29, 2017

alexcrichton commented Aug 29, 2017

Mark-Simulacrum commented Aug 29, 2017

alexcrichton commented Aug 29, 2017

bors commented Aug 29, 2017

aidanhs Aug 29, 2017

Choose a reason for hiding this comment

kennytm Aug 29, 2017

Choose a reason for hiding this comment

aidanhs commented Aug 29, 2017

alexcrichton commented Aug 29, 2017

bors commented Aug 29, 2017

alexcrichton commented Aug 29, 2017

bors commented Aug 29, 2017

kennytm commented Aug 30, 2017 • edited Loading

steveklabnik commented Aug 30, 2017

steveklabnik commented Aug 30, 2017

bors commented Aug 31, 2017

alexcrichton commented Aug 31, 2017

bors commented Aug 31, 2017

kennytm commented Aug 31, 2017

alexcrichton commented Aug 31, 2017

alexcrichton commented Aug 31, 2017

bors commented Aug 31, 2017

bors commented Aug 31, 2017

bors commented Aug 31, 2017

steveklabnik commented Aug 31, 2017

alexcrichton commented Sep 1, 2017

bors commented Sep 1, 2017

bors commented Sep 1, 2017

bors commented Sep 1, 2017

kennytm commented Sep 1, 2017

alexcrichton commented Sep 1, 2017

bors commented Sep 1, 2017

bors commented Sep 1, 2017

bors commented Sep 1, 2017

kennytm commented Aug 30, 2017 •

edited

Loading