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.

Sign up for GitHub

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

Jump to bottom

refactor build_session_options_and_crate_config & move parse_cfgspecs #65361

Closed
wants to merge 3 commits into from
Closed

refactor build_session_options_and_crate_config & move parse_cfgspecs #65361

wants to merge 3 commits into from

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Oct 13, 2019

Part of #65324.

r? @petrochenkov

@rust-highfive

This comment has been minimized.

Sign in to view
@JohnTitor JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 13, 2019
petrochenkov
petrochenkov reviewed Oct 13, 2019
View reviewed changes
src/librustc/session/config.rs
early_error(
error_format,
"value for threads must be a positive non-zero integer",
"value for codegen units must be a positive non-zero integer",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Damn, GitHub makes some parts of the diff really misleading.

@petrochenkov
Copy link
Contributor

r=me with tests updated

@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 13, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
2019-10-13T12:08:43.0254979Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-10-13T12:08:43.9688567Z ##[command]git config gc.auto 0
2019-10-13T12:08:43.9691399Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-10-13T12:08:43.9693584Z ##[command]git config --get-all http.proxy
2019-10-13T12:08:43.9696705Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/65361/merge:refs/remotes/pull/65361/merge
---
2019-10-13T13:13:38.8339483Z .................................................................................................... 1600/9172
2019-10-13T13:13:45.6225543Z .................................................................................................... 1700/9172
2019-10-13T13:13:58.6615476Z ......................i...............i............................................................. 1800/9172
2019-10-13T13:14:06.3364662Z .................................................................................................... 1900/9172
2019-10-13T13:14:22.1368551Z .............iiiii.................................................................................. 2000/9172
2019-10-13T13:14:33.2460967Z .................................................................................................... 2200/9172
2019-10-13T13:14:36.0857960Z .................................................................................................... 2300/9172
2019-10-13T13:14:42.0465439Z .................................................................................................... 2400/9172
2019-10-13T13:15:05.4962470Z .................................................................................................... 2500/9172
---
2019-10-13T13:18:16.0813110Z ....................i...............i............................................................... 4800/9172
2019-10-13T13:18:28.7616834Z .................................................................................................... 4900/9172
2019-10-13T13:18:35.6459682Z .................................................................................................... 5000/9172
2019-10-13T13:18:47.0064003Z .................................................................................................... 5100/9172
2019-10-13T13:18:53.7545345Z ....................ii.ii........................................................................... 5200/9172
2019-10-13T13:19:04.9799516Z .................................................................................................... 5400/9172
2019-10-13T13:19:15.8059993Z ......................................................................................i............. 5500/9172
2019-10-13T13:19:24.5493092Z .................................................................................................... 5600/9172
2019-10-13T13:19:30.2508797Z .................................................................................................... 5700/9172
2019-10-13T13:19:30.2508797Z .................................................................................................... 5700/9172
2019-10-13T13:19:41.6016210Z ...................................................................................ii...i..ii....... 5800/9172
2019-10-13T13:20:08.5740231Z .................................................................................................... 6000/9172
2019-10-13T13:20:19.1389652Z .................................................................................................... 6100/9172
2019-10-13T13:20:19.1389652Z .................................................................................................... 6100/9172
2019-10-13T13:20:25.8318070Z ..........................................................................................i..ii..... 6200/9172
2019-10-13T13:20:56.5012265Z .................................................................................................... 6400/9172
2019-10-13T13:21:01.1109621Z ..................................................i................................................. 6500/9172
2019-10-13T13:21:03.4544150Z .................................................................................................... 6600/9172
2019-10-13T13:21:06.0355918Z .......................i............................................................................ 6700/9172
---
2019-10-13T13:26:02.1416363Z  finished in 5.880
2019-10-13T13:26:02.1622344Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-13T13:26:02.3372367Z 
2019-10-13T13:26:02.3372653Z running 153 tests
2019-10-13T13:26:05.8334542Z i....iii......iii..iiii....i.............................i..i..................i....i............ii. 100/153
2019-10-13T13:26:07.9743819Z i.i..iiii..............i.........iii.i.......ii......
2019-10-13T13:26:07.9745672Z 
2019-10-13T13:26:07.9750671Z  finished in 5.813
2019-10-13T13:26:07.9943907Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-13T13:26:08.1673526Z 
---
2019-10-13T13:26:10.3929064Z  finished in 2.398
2019-10-13T13:26:10.4135548Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-13T13:26:10.5812437Z 
2019-10-13T13:26:10.5813020Z running 9 tests
2019-10-13T13:26:10.5817124Z iiiiiiiii
2019-10-13T13:26:10.5817733Z 
2019-10-13T13:26:10.5817779Z  finished in 0.168
2019-10-13T13:26:10.6015219Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-13T13:26:10.7769474Z 
---
2019-10-13T13:26:29.9903921Z  finished in 19.389
2019-10-13T13:26:30.0101928Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-13T13:26:30.1912269Z 
2019-10-13T13:26:30.1912605Z running 123 tests
2019-10-13T13:26:55.6034810Z .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....ii..........iiii..........i...ii...i.......ii. 100/123
2019-10-13T13:27:00.6089457Z i.i.i......iii.i.....ii
2019-10-13T13:27:00.6090246Z 
2019-10-13T13:27:00.6090290Z  finished in 30.598
2019-10-13T13:27:00.6101359Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-13T13:27:00.6101767Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-10-13T13:40:55.2526475Z 
2019-10-13T13:40:55.2527526Z    Doc-tests core
2019-10-13T13:41:00.6592447Z 
2019-10-13T13:41:00.6593936Z running 2405 tests
2019-10-13T13:41:12.5626009Z ......iiiii......................................................................................... 100/2405
2019-10-13T13:41:24.0585405Z ...............................................................................ii................... 200/2405
2019-10-13T13:41:51.2227805Z .i.................................................................................................. 400/2405
2019-10-13T13:41:51.2227805Z .i.................................................................................................. 400/2405
2019-10-13T13:42:02.3404129Z ................................................i..i.................iiii........................... 500/2405
2019-10-13T13:42:24.1438223Z .................................................................................................... 700/2405
2019-10-13T13:42:35.6204207Z .................................................................................................... 800/2405
2019-10-13T13:42:47.0316164Z .................................................................................................... 900/2405
2019-10-13T13:42:58.2485891Z .................................................................................................... 1000/2405
---
2019-10-13T13:47:13.7352542Z ............................................... 300/763
2019-10-13T13:47:13.7353287Z thread '<unnamed>' panicked at 'explicit panic', src/libstd/io/stdio.rs:854:13
2019-10-13T13:47:13.7353714Z .................................................................................................... 400/763
2019-10-13T13:47:15.2135748Z .................................................................................................... 500/763
2019-10-13T13:47:15.2445779Z ....................thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1165:5
2019-10-13T13:47:15.2499532Z ....thread 'thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: "SendError(..)"', src/libcore/result.rs:1165:5
2019-10-13T13:47:15.2535027Z <unnamed>....' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:..............thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1165:5
2019-10-13T13:47:15.5163201Z ...............................thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1165:5
2019-10-13T13:47:15.5184623Z ....thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1165:5
2019-10-13T13:47:15.5186928Z thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: "SendError(..)"', src/libcore/result.rs:1165:5
2019-10-13T13:47:15.5233984Z .......thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1165:5
---
2019-10-13T13:47:17.6127771Z   left: `1`,
2019-10-13T13:47:17.6132287Z  right: `2`', src/libstd/sync/mutex.rs:653:13
2019-10-13T13:47:17.6164361Z ..........thread '<unnamed>' panicked at 'test panic in inner thread to poison RwLock', src/libstd/sync/rwlock.rs:791:13
2019-10-13T13:47:17.6170264Z thread '<unnamed>' panicked at 'test panic in inner thread to poison RwLock', src/libstd/sync/rwlock.rs:768:13
2019-10-13T13:47:17.6180499Z .....thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/rwlock.rs:705:13
2019-10-13T13:47:17.6187201Z .thread '<unnamed>.' panicked at 'explicit panic', src/libstd/sync/rwlock.rs:635:13
2019-10-13T13:47:17.6197403Z .thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/rwlock.rs:611:13
2019-10-13T13:47:17.6203542Z .thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/rwlock.rs:623:13
2019-10-13T13:47:19.6588174Z ..........................thread '<unnamed>' panicked at 'What the answer to my lifetimes dilemma is?', src/libstd/sys_common/remutex.rs:233:13
2019-10-13T13:47:19.6633706Z ........................ 700/763
---
2019-10-13T13:47:27.2385706Z 
2019-10-13T13:47:27.2386774Z running 994 tests
2019-10-13T13:47:50.3233513Z i................................................................................................... 100/994
2019-10-13T13:48:02.9595517Z .................................................................................................... 200/994
2019-10-13T13:48:12.0911758Z ...................iii......i......i...i......i..................................................... 300/994
2019-10-13T13:48:18.3858346Z .................................................................................................... 400/994
2019-10-13T13:48:26.8371360Z .....................................i..i.................................ii........................ 500/994
2019-10-13T13:48:43.1495675Z .................................................................................................... 700/994
2019-10-13T13:48:43.1495675Z .................................................................................................... 700/994
2019-10-13T13:48:51.9360069Z ....................iiii............................................................................ 800/994
2019-10-13T13:49:08.1598518Z .................................................................................................... 900/994
2019-10-13T13:49:16.4755842Z ..........................................iiii................................................
2019-10-13T13:49:16.4757277Z 
2019-10-13T13:49:16.4814113Z  finished in 209.047
2019-10-13T13:49:16.4830166Z Testing term stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-13T13:49:16.7061064Z    Compiling term v0.0.0 (/checkout/src/libterm)
---
2019-10-13T13:49:39.4600177Z 
2019-10-13T13:49:39.4652862Z  finished in 3.106
2019-10-13T13:49:39.4673462Z Testing rustc stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-13T13:49:39.7371940Z    Compiling rustc v0.0.0 (/checkout/src/librustc)
2019-10-13T13:50:27.3366659Z error: duplicate diagnostic item found: `Ty`.
2019-10-13T13:50:27.3368288Z     |
2019-10-13T13:50:27.3368288Z     |
2019-10-13T13:50:27.3368791Z 595 | pub type Ty<'tcx> = &'tcx TyS<'tcx>;
2019-10-13T13:50:27.3370490Z     |
2019-10-13T13:50:27.3370947Z     = note: first defined in crate `rustc`.
2019-10-13T13:50:27.3371144Z 
2019-10-13T13:50:27.3371144Z 
2019-10-13T13:50:27.3371561Z error: duplicate diagnostic item found: `TyKind`.
2019-10-13T13:50:27.3372005Z    --> src/librustc/ty/sty.rs:90:1
2019-10-13T13:50:27.3372401Z     |
2019-10-13T13:50:27.3372903Z 90  | / pub enum TyKind<'tcx> {
2019-10-13T13:50:27.3374147Z 91  | |     /// The primitive boolean type. Written as `bool`.
2019-10-13T13:50:27.3375481Z 93  | |
2019-10-13T13:50:27.3376057Z ...   |
2019-10-13T13:50:27.3376507Z 209 | |     Error,
2019-10-13T13:50:27.3377085Z 210 | | }
2019-10-13T13:50:27.3377085Z 210 | | }
2019-10-13T13:50:27.3377524Z     | |_^
2019-10-13T13:50:27.3377885Z     |
2019-10-13T13:50:27.3378599Z     = note: first defined in crate `rustc`.
2019-10-13T13:50:27.3378763Z 
2019-10-13T13:50:27.3379700Z error: duplicate diagnostic item found: `TyCtxt`.
2019-10-13T13:50:27.3380485Z     --> src/librustc/ty/context.rs:1017:1
2019-10-13T13:50:27.3382541Z 1017 | / pub struct TyCtxt<'tcx> {
2019-10-13T13:50:27.3382541Z 1017 | / pub struct TyCtxt<'tcx> {
2019-10-13T13:50:27.3383540Z 1018 | |     gcx: &'tcx GlobalCtxt<'tcx>,
2019-10-13T13:50:27.3384879Z      | |_^
2019-10-13T13:50:27.3385642Z      |
2019-10-13T13:50:27.3386158Z      = note: first defined in crate `rustc`.
2019-10-13T13:50:27.3386325Z 
---
2019-10-13T13:50:28.8225745Z == clock drift check ==
2019-10-13T13:50:28.8245321Z   local time: Sun Oct 13 13:50:28 UTC 2019
2019-10-13T13:50:29.1041559Z   network time: Sun, 13 Oct 2019 13:50:29 GMT
2019-10-13T13:50:29.1041689Z == end clock drift check ==
2019-10-13T13:50:29.8562998Z ##[error]Bash exited with code '1'.
2019-10-13T13:50:29.8634670Z ##[section]Starting: Checkout
2019-10-13T13:50:29.8637353Z ==============================================================================
2019-10-13T13:50:29.8637425Z Task         : Get sources
2019-10-13T13:50:29.8637474Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Centril Centril mentioned this pull request Oct 13, 2019
Merged
Centril added a commit to Centril/rust that referenced this pull request Oct 14, 2019
@Centril
Rollup merge of rust-lang#65379 - Centril:refactor-bso_and_cc, r=petr…
d24da2a 
…ochenkov

refactor session::config::build_session_options_and_crate_config

I'm not exactly sure what happened in rust-lang#65361 (comment) so in an effort to bisect the error I'm extracting out the first commit so it can hopefully land (I suspect the error is in the 2nd-3rd commits.)

r? @petrochenkov

(I'll r=you when the PR builder is happy)
Centril added a commit to Centril/rust that referenced this pull request Oct 14, 2019
@Centril
Rollup merge of rust-lang#65379 - Centril:refactor-bso_and_cc, r=petr…
e29a6fc 
…ochenkov

refactor session::config::build_session_options_and_crate_config

I'm not exactly sure what happened in rust-lang#65361 (comment) so in an effort to bisect the error I'm extracting out the first commit so it can hopefully land (I suspect the error is in the 2nd-3rd commits.)

r? @petrochenkov

(I'll r=you when the PR builder is happy)
@bors
Copy link
Contributor

bors commented Oct 14, 2019

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

@Centril
Copy link
Contributor Author

Centril commented Oct 19, 2019

Closing in favor of #65595.

@Centril Centril closed this Oct 19, 2019
@Centril Centril deleted the bsocc branch October 19, 2019 11:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Centril @rust-highfive @petrochenkov @bors @JohnTitor