Bump master to 1.21.0 #43320

alexcrichton · 2017-07-18T21:32:11Z

This commit bumps the master branch's version to 1.21.0 and also updates the
bootstrap compiler from the freshly minted beta release.

rust-highfive · 2017-07-18T21:32:22Z

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

Mark-Simulacrum · 2017-07-19T00:06:04Z

I've restarted the PR builder, but this is the log:

[00:51:41] failed to execute command: "llvm-config" "--version"
[00:51:41] error: No such file or directory (os error 2)

kennytm · 2017-07-19T09:35:41Z

Failed again, legit.

// src/librustc_llvm/build.rs
    let llvm_config = env::var_os("LLVM_CONFIG")
        .map(PathBuf::from)
        .unwrap_or_else(|| {
            if let Some(dir) = env::var_os("CARGO_TARGET_DIR").map(PathBuf::from) {
                let to_test = dir.parent()
                    .unwrap()
                    .parent()
                    .unwrap()
                    .join(&target)
                    .join("llvm/bin/llvm-config");
                if Command::new(&to_test).output().is_ok() {
                    return to_test;
                }
            }
            PathBuf::from("llvm-config")
        });
...
    let mut version_cmd = Command::new(&llvm_config);
    version_cmd.arg("--version");

Looks like both $LLVM_CONFIG is undefined and $CARGO_TARGET_DIR/../../$TARGET/llvm/bin/llvm-config is invalid, causing it fall back to use the built-in llvm-config which does not exist.

est31 · 2017-07-20T04:40:02Z

Failed again, seems still legit.

bors · 2017-07-21T23:49:05Z

☔ The latest upstream changes (presumably #43319) made this pull request unmergeable. Please resolve the merge conflicts.

alexcrichton · 2017-07-22T03:43:02Z

r? @Mark-Simulacrum

Mark-Simulacrum · 2017-07-22T12:01:59Z

src/bootstrap/compile.rs

+
+/// Configures the `cargo` command with env vars and such to build the standard
+/// library.
+pub fn std_cargo(build: &Build,


What do you think about making {std,test,rustc}_cargo call Cargo themselves? Probably more than we want to do in this patch, but I believe it'd make the code cleaner, could you add a FIXME or file an issue?

Oh I don't think we'd want to end up doing that because while the compile.rs invocations immediately just run Cargo the check.rs will add more args (like --no-fail-fast) and also maybe not abort the build if the test run fails.

Mark-Simulacrum · 2017-07-22T12:02:36Z

Other than filing the issue or fixing the nit, r=me.

alexcrichton · 2017-07-22T16:21:13Z

@bors: r=Mark-Simulacrum

bors · 2017-07-22T16:21:14Z

📌 Commit 7ec9cc2 has been approved by Mark-Simulacrum

bors · 2017-07-22T20:55:32Z

🔒 Merge conflict

bors · 2017-07-22T20:58:42Z

☔ The latest upstream changes (presumably #43059) made this pull request unmergeable. Please resolve the merge conflicts.

Mark-Simulacrum · 2017-07-23T11:45:24Z

@bors r+

bors · 2017-07-23T11:45:25Z

📌 Commit 48ee28b has been approved by Mark-Simulacrum

Mark-Simulacrum · 2017-07-23T11:45:47Z

@bors p=1

bors · 2017-07-23T11:55:04Z

⌛ Testing commit 48ee28bad7b3a344c2e884f6834b72d5fe2b66cf with merge 7fac9cc983f848ca2722fcb9c5f88475bac61a97...

bors · 2017-07-23T13:04:10Z

💔 Test failed - status-travis

Mark-Simulacrum · 2017-07-23T13:11:59Z

It does seem likely that we have two different versions of rls-data in use: https://github.com/rust-lang/rust/pull/43320/files#diff-5d9bf57935c52008319cccc88d4d737dR2208.

[01:03:18] error[E0308]: mismatched types
[01:03:18]    --> /checkout/src/tools/rls/src/actions/mod.rs:183:55
[01:03:18]     |
[01:03:18] 183 |                         analysis.reload_from_analysis(new_analysis, &project_path, &cwd, false).unwrap();
[01:03:18]     |                                                       ^^^^^^^^^^^^ expected struct `rls_data::Analysis`, found struct `data::Analysis`
[01:03:18]     |
[01:03:18]     = note: expected type `rls_data::Analysis`
[01:03:18]                found type `data::Analysis`
[01:03:18] note: Perhaps two different versions of crate `rls_data` are being used?
[01:03:18]    --> /checkout/src/tools/rls/src/actions/mod.rs:183:55
[01:03:18]     |
[01:03:18] 183 |                         analysis.reload_from_analysis(new_analysis, &project_path, &cwd, false).unwrap();
[01:03:18]     |                                                       ^^^^^^^^^^^^
[01:03:18]
[01:03:18] error: aborting due to previous error

alexcrichton · 2017-07-23T15:16:52Z

@bors: r=Mark-Simulacrum

bors · 2017-07-23T15:16:52Z

📌 Commit f2b7dd8 has been approved by Mark-Simulacrum

alexcrichton · 2017-07-24T17:24:14Z

@bors: r=Mark-Simulacrum

bors · 2017-07-24T17:24:15Z

📌 Commit 6eb6ab3 has been approved by Mark-Simulacrum

bors · 2017-07-24T22:58:02Z

⌛ Testing commit 6eb6ab3a5b8b9ae28517a682ba35fd17da115bc6 with merge 08a7f5b0ca65e6a586bf4b57c30d4f78c2e865f8...

bors · 2017-07-24T23:59:59Z

💔 Test failed - status-appveyor

Mark-Simulacrum · 2017-07-25T00:49:00Z

Hmm, this is odd. I don't recall this PR having any relevant changes that could cause this.

[01:00:37] error[E0460]: found possibly newer version of crate `syntax` which `proc_macro` depends on
[01:00:37]   --> C:\Users\appveyor\.cargo\registry\src\github.com-1ecc6299db9ec823\serde_derive-1.0.10\s
[01:00:37]    |
[01:00:37] 33 | extern crate proc_macro;
[01:00:37]    | ^^^^^^^^^^^^^^^^^^^^^^^^
[01:00:37]    |
[01:00:37]    = note: perhaps that crate needs to be recompiled?
[01:00:37]    = note: crate `syntax` path #1: \\?\C:\projects\rust\build\x86_64-pc-windows-msvc\stage2\l
[01:00:37]    = note: crate `proc_macro` path #1: \\?\C:\projects\rust\build\x86_64-pc-windows-msvc\stag
[01:00:37]    = help: please recompile that crate using --crate-type lib
[01:00:37]    = note: crate `syntax` path #1: C:\projects\rust\build\x86_64-pc-windows-msvc\stage2\lib\r
[01:00:37]    = note: crate `syntax` path #2: C:\projects\rust\build\x86_64-pc-windows-msvc\stage2\lib\r
[01:00:37]    = note: crate `syntax` path #3: C:\projects\rust\build\x86_64-pc-windows-msvc\stage2\lib\r

alexcrichton · 2017-07-25T04:44:54Z

I think it may have been a bug in rustbuild

@bors: r=Mark-Simulacrum

bors · 2017-07-25T04:44:54Z

📌 Commit c6a1568 has been approved by Mark-Simulacrum

bors · 2017-07-25T06:25:44Z

⌛ Testing commit c6a1568f8d57569404b44fde518ed0f3abc166df with merge e11b865e13a728a8bbe9c6f33294d58b0ffb0a49...

bors · 2017-07-25T07:26:10Z

💔 Test failed - status-appveyor

kennytm · 2017-07-25T07:30:03Z

Same extern crate proc_macro; problem as before…

error[E0460]: found possibly newer version of crate `syntax` which `proc_macro` depends on
  --> C:\Users\appveyor\.cargo\registry\src\github.com-1ecc6299db9ec823\serde_derive-1.0.10\src\lib.rs:33:1
   |
33 | extern crate proc_macro;
   | ^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: perhaps that crate needs to be recompiled?
   = note: crate `syntax` path #1: \\?\C:\projects\rust\build\x86_64-pc-windows-msvc\stage2\lib\rustlib\x86_64-pc-windows-msvc\lib\syntax-6196dacf1e65a603.dll
   = note: crate `proc_macro` path #1: \\?\C:\projects\rust\build\x86_64-pc-windows-msvc\stage2\lib\rustlib\x86_64-pc-windows-msvc\lib\proc_macro-fc867c3f551cd774.dll
   = help: please recompile that crate using --crate-type lib
   = note: crate `syntax` path #1: C:\projects\rust\build\x86_64-pc-windows-msvc\stage2\lib\rustlib\x86_64-pc-windows-msvc\lib\syntax-6196dacf1e65a603.dll.lib
   = note: crate `syntax` path #2: C:\projects\rust\build\x86_64-pc-windows-msvc\stage2\lib\rustlib\x86_64-pc-windows-msvc\lib\syntax_ext-11b7b12ae499f2f9.dll.lib
   = note: crate `syntax` path #3: C:\projects\rust\build\x86_64-pc-windows-msvc\stage2\lib\rustlib\x86_64-pc-windows-msvc\lib\syntax_pos-a675ced0e8b4f384.dll.lib
error: aborting due to previous error

BTW the diagnostic should be improved, it is unclear whether "that crate" means syntax or proc_macro.

This commit bumps the master branch's version to 1.21.0 and also updates the bootstrap compiler from the freshly minted beta release.

alexcrichton · 2017-07-25T14:03:31Z

@bors: r=Mark-Simulacrum

bors · 2017-07-25T14:03:31Z

📌 Commit 9010567 has been approved by Mark-Simulacrum

bors · 2017-07-25T16:13:21Z

⌛ Testing commit 9010567 with merge c417ee9...

Bump master to 1.21.0 This commit bumps the master branch's version to 1.21.0 and also updates the bootstrap compiler from the freshly minted beta release.

bors · 2017-07-25T18:45:32Z

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

In rust-lang#42938 we made the compiler emit a call to begin_panic_new in order to pass column info to it. Now with stage0 updated (rust-lang#43320), we can safely change begin_panic and start emitting calls for it again.

Switch to begin_panic again In #42938 we made the compiler emit a call to begin_panic_new in order to pass column info to it. Now with stage0 updated (#43320), we can safely change begin_panic and start emitting calls for it again.

rust-highfive assigned brson Jul 18, 2017

arielb1 added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 18, 2017

alexcrichton force-pushed the new-bootstrap branch from 7e29356 to f8f578f Compare July 19, 2017 14:07

alexcrichton force-pushed the new-bootstrap branch from f8f578f to 49da72f Compare July 20, 2017 15:46

rust-highfive assigned Mark-Simulacrum and unassigned brson Jul 22, 2017

alexcrichton force-pushed the new-bootstrap branch from 49da72f to 7ec9cc2 Compare July 22, 2017 03:44

Mark-Simulacrum reviewed Jul 22, 2017

View reviewed changes

alexcrichton force-pushed the new-bootstrap branch from 7ec9cc2 to 48ee28b Compare July 23, 2017 04:57

alexcrichton force-pushed the new-bootstrap branch from 48ee28b to f2b7dd8 Compare July 23, 2017 15:16

alexcrichton force-pushed the new-bootstrap branch from 32fe9d6 to 6eb6ab3 Compare July 24, 2017 17:24

alexcrichton force-pushed the new-bootstrap branch from 6eb6ab3 to c6a1568 Compare July 25, 2017 04:44

Bump master to 1.21.0

9010567

This commit bumps the master branch's version to 1.21.0 and also updates the bootstrap compiler from the freshly minted beta release.

alexcrichton force-pushed the new-bootstrap branch from c6a1568 to 9010567 Compare July 25, 2017 14:03

bors mentioned this pull request Jul 25, 2017

Fix printing regions with -Z verbose #43458

Merged

bors merged commit 9010567 into rust-lang:master Jul 25, 2017

est31 mentioned this pull request Jul 25, 2017

Switch to begin_panic again #43477

Merged

cuviper mentioned this pull request Jul 27, 2017

stage0 libstd fails to build when jemalloc is disabled #43510

Closed

alexcrichton deleted the new-bootstrap branch August 22, 2017 19:44

Bump master to 1.21.0 #43320

Bump master to 1.21.0 #43320

Conversation

alexcrichton commented Jul 18, 2017

rust-highfive commented Jul 18, 2017

Mark-Simulacrum commented Jul 19, 2017

kennytm commented Jul 19, 2017

est31 commented Jul 20, 2017

bors commented Jul 21, 2017

alexcrichton commented Jul 22, 2017

Mark-Simulacrum Jul 22, 2017

Choose a reason for hiding this comment

alexcrichton Jul 22, 2017

Choose a reason for hiding this comment

Mark-Simulacrum commented Jul 22, 2017

alexcrichton commented Jul 22, 2017

bors commented Jul 22, 2017

bors commented Jul 22, 2017

bors commented Jul 22, 2017

Mark-Simulacrum commented Jul 23, 2017

bors commented Jul 23, 2017

Mark-Simulacrum commented Jul 23, 2017

bors commented Jul 23, 2017

bors commented Jul 23, 2017

Mark-Simulacrum commented Jul 23, 2017

alexcrichton commented Jul 23, 2017

bors commented Jul 23, 2017

alexcrichton commented Jul 24, 2017

bors commented Jul 24, 2017

bors commented Jul 24, 2017

bors commented Jul 24, 2017

Mark-Simulacrum commented Jul 25, 2017

alexcrichton commented Jul 25, 2017

bors commented Jul 25, 2017

bors commented Jul 25, 2017

bors commented Jul 25, 2017

kennytm commented Jul 25, 2017 • edited

alexcrichton commented Jul 25, 2017

bors commented Jul 25, 2017

bors commented Jul 25, 2017

bors commented Jul 25, 2017

kennytm commented Jul 25, 2017 •

edited