Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustbuild: Compile the error-index in stage 2 #44605

Merged
merged 1 commit into from
Sep 16, 2017

Conversation

alexcrichton
Copy link
Member

Right now we comiple rustdoc in stage 2 and the error index in stage 0, which
ends up compiling rustdoc twice! To avoid compiling rustdoc twice (which takes
awhile) let's just compile it once in stage 2.

Right now we comiple rustdoc in stage 2 and the error index in stage 0, which
ends up compiling rustdoc twice! To avoid compiling rustdoc twice (which takes
awhile) let's just compile it once in stage 2.
@rust-highfive
Copy link
Collaborator

r? @aturon

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

@alexcrichton
Copy link
Member Author

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

@bors r+ p=1 (perf win)

@bors
Copy link
Contributor

bors commented Sep 15, 2017

📌 Commit 61e255a has been approved by Mark-Simulacrum

@alexcrichton alexcrichton added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 15, 2017
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Sep 16, 2017
…imulacrum

rustbuild: Compile the error-index in stage 2

Right now we comiple rustdoc in stage 2 and the error index in stage 0, which
ends up compiling rustdoc twice! To avoid compiling rustdoc twice (which takes
awhile) let's just compile it once in stage 2.
@bors
Copy link
Contributor

bors commented Sep 16, 2017

⌛ Testing commit 61e255a with merge eae9a39b602d021a6c97112fd5e29d8223c02e68...

@bors
Copy link
Contributor

bors commented Sep 16, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Sep 16, 2017

@bors retry

check i686-apple-darwin failed, lldb segfault. Should be spurious.

[01:34:20] failures:
[01:34:20] 
[01:34:20] ---- [debuginfo-lldb] debuginfo-lldb/lexical-scope-in-unique-closure.rs stdout ----
[01:34:20] 	NOTE: compiletest thinks it is using LLDB version 360
[01:34:20] 
[01:34:20] error: Error while running LLDB
[01:34:20] status: signal: 11
[01:34:20] command: "/usr/bin/python" "/Users/travis/build/rust-lang/rust/src/etc/lldb_batchmode.py" "/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/test/debuginfo/lexical-scope-in-unique-closure.stage2-i686-apple-darwin" "/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/test/debuginfo/lexical-scope-in-unique-closure.debugger.script"
[01:34:20] stdout:
[01:34:20] ------------------------------------------
[01:34:20] LLDB batch-mode script
[01:34:20] ----------------------
[01:34:20] Debugger commands script is '/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/test/debuginfo/lexical-scope-in-unique-closure.debugger.script'.
[01:34:20] Target executable is '/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/test/debuginfo/lexical-scope-in-unique-closure.stage2-i686-apple-darwin'.
[01:34:20] Current working directory is '/Users/travis/build/rust-lang/rust'
[01:34:20] Creating a target for '/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/test/debuginfo/lexical-scope-in-unique-closure.stage2-i686-apple-darwin'
[01:34:20] settings set auto-confirm true
[01:34:20] 
[01:34:20] version
[01:34:20] lldb-360.1.70 
[01:34:20] command script import /Users/travis/build/rust-lang/rust/./src/etc/lldb_rust_formatters.py
[01:34:20] type summary add --no-value --python-function lldb_rust_formatters.print_val -x ".*" --category Rust
[01:34:20] type category enable Rust
[01:34:20] 
[01:34:20] breakpoint set --file 'lexical-scope-in-unique-closure.rs' --line 80
[01:34:20] Breakpoint 1: where = lexical-scope-in-unique-closure.stage2-i686-apple-darwin`lexical_scope_in_unique_closure::main + 10 at lexical-scope-in-unique-closure.rs:80, address = 0x00001dea 
[01:34:20] breakpoint set --file 'lexical-scope-in-unique-closure.rs' --line 84
[01:34:20] Breakpoint 2: where = lexical-scope-in-unique-closure.stage2-i686-apple-darwin`lexical_scope_in_unique_closure::main::{{closure}} + 30 at lexical-scope-in-unique-closure.rs:84, address = 0x00001e4e 
[01:34:20] breakpoint set --file 'lexical-scope-in-unique-closure.rs' --line 89
[01:34:20] Breakpoint 3: where = lexical-scope-in-unique-closure.stage2-i686-apple-darwin`lexical_scope_in_unique_closure::main::{{closure}} + 59 at lexical-scope-in-unique-closure.rs:89, address = 0x00001e6b 
[01:34:20] breakpoint set --file 'lexical-scope-in-unique-closure.rs' --line 94
[01:34:20] Breakpoint 4: where = lexical-scope-in-unique-closure.stage2-i686-apple-darwin`lexical_scope_in_unique_closure::main::{{closure}} + 73 at lexical-scope-in-unique-closure.rs:94, address = 0x00001e79 
[01:34:20] breakpoint set --file 'lexical-scope-in-unique-closure.rs' --line 98
[01:34:20] Breakpoint 5: where = lexical-scope-in-unique-closure.stage2-i686-apple-darwin`lexical_scope_in_unique_closure::main + 20 at lexical-scope-in-unique-closure.rs:98, address = 0x00001df4 
[01:34:20] breakpoint set --file 'lexical-scope-in-unique-closure.rs' --line 103
[01:34:20] Breakpoint 6: where = lexical-scope-in-unique-closure.stage2-i686-apple-darwin`lexical_scope_in_unique_closure::main + 55 at lexical-scope-in-unique-closure.rs:103, address = 0x00001e17 
[01:34:20] quit
[01:34:20] 
[01:34:20] 
[01:34:20] ------------------------------------------
[01:34:20] stderr:
[01:34:20] ------------------------------------------
[01:34:20] 
[01:34:20] ------------------------------------------
[01:34:20] 
[01:34:20] thread '[debuginfo-lldb] debuginfo-lldb/lexical-scope-in-unique-closure.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:2435:8
[01:34:20] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:34:20] 
[01:34:20] 
[01:34:20] failures:
[01:34:20]     [debuginfo-lldb] debuginfo-lldb/lexical-scope-in-unique-closure.rs
[01:34:20] 
[01:34:20] test result: �[31mFAILED�(B�[m. 97 passed; 1 failed; 10 ignored; 0 measured; 0 filtered out

@bors
Copy link
Contributor

bors commented Sep 16, 2017

⌛ Testing commit 61e255a with merge b965d55...

bors added a commit that referenced this pull request Sep 16, 2017
rustbuild: Compile the error-index in stage 2

Right now we comiple rustdoc in stage 2 and the error index in stage 0, which
ends up compiling rustdoc twice! To avoid compiling rustdoc twice (which takes
awhile) let's just compile it once in stage 2.
@bors
Copy link
Contributor

bors commented Sep 16, 2017

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

@bors bors merged commit 61e255a into rust-lang:master Sep 16, 2017
@alexcrichton alexcrichton deleted the less-rustdoc branch September 18, 2017 16:01
bors added a commit that referenced this pull request Oct 22, 2017
…lacrum

rustbuild: Build stage 1 error index generator at stage 0

At stage 1 rustdoc is built at stage 0 so the error index generator should be as well.

This fixes `x.py --stage 1 doc` as rustdoc doesn't even build at stage 1.

It was broken by #44605.

r? @alexcrichton
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants