Move some code to librustc_passes. by cjgillot · Pull Request #67688 · rust-lang/rust

cjgillot · 2019-12-28T22:37:43Z

Per instructions by @Zoxc, some code from librustc::middle is moved to librustc_passes.

rust-highfive · 2019-12-29T00:16:49Z

The job x86_64-gnu-llvm-7 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-12-28T22:38:22.3054485Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-28T22:38:22.3254552Z ##[command]git config gc.auto 0
2019-12-28T22:38:22.3343415Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-28T22:38:22.3394374Z ##[command]git config --get-all http.proxy
2019-12-28T22:38:22.3561257Z ##[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/67688/merge:refs/remotes/pull/67688/merge
---
2019-12-28T23:40:19.7809022Z .................................................................................................... 1600/9462
2019-12-28T23:40:24.6188826Z .................................................................................................... 1700/9462
2019-12-28T23:40:33.9313451Z .................................................................................................i.. 1800/9462
2019-12-28T23:40:42.0811820Z .................................................................................................... 1900/9462
2019-12-28T23:40:48.7037644Z ...................................................................................iiiii............ 2000/9462
2019-12-28T23:41:10.4285282Z .................................................................................................... 2200/9462
2019-12-28T23:41:12.7988239Z .................................................................................................... 2300/9462
2019-12-28T23:41:15.2516950Z .................................................................................................... 2400/9462
2019-12-28T23:41:21.3073964Z .................................................................................................... 2500/9462
---
2019-12-28T23:44:19.7094323Z ..............i...............i..................................................................... 4900/9462
2019-12-28T23:44:29.6049904Z .................................................................................................... 5000/9462
2019-12-28T23:44:35.1791396Z ...........................................................i........................................ 5100/9462
2019-12-28T23:44:43.5562830Z .................................................................................................... 5200/9462
2019-12-28T23:44:50.9766703Z ..........................ii.ii...........i......................................................... 5300/9462
2019-12-28T23:45:00.0691161Z .................................................................................................... 5500/9462
2019-12-28T23:45:10.6851778Z .................................................................................................... 5600/9462
2019-12-28T23:45:17.5039419Z ........i........................................................................................... 5700/9462
2019-12-28T23:45:23.6670019Z .................................................................................................... 5800/9462
2019-12-28T23:45:23.6670019Z .................................................................................................... 5800/9462
2019-12-28T23:45:34.0100929Z ................................................................................................ii.. 5900/9462
2019-12-28T23:45:46.1724736Z .i..ii...........i.................................................................................. 6000/9462
2019-12-28T23:46:03.7717060Z .................................................................................................... 6200/9462
2019-12-28T23:46:11.1011416Z .................................................................................................... 6300/9462
2019-12-28T23:46:11.1011416Z .................................................................................................... 6300/9462
2019-12-28T23:46:30.7074727Z .......................i..ii........................................................................ 6400/9462
2019-12-28T23:46:51.7566579Z .................................................................................................... 6600/9462
2019-12-28T23:46:53.8616288Z i................................................................................................... 6700/9462
2019-12-28T23:46:56.2085537Z .................................................................................................... 6800/9462
2019-12-28T23:46:58.7472578Z i................................................................................................... 6900/9462
---
2019-12-28T23:48:37.7580543Z .................................................................................................... 7500/9462
2019-12-28T23:48:42.6066685Z .................................................................................................... 7600/9462
2019-12-28T23:48:49.3329712Z .................................................................................................... 7700/9462
2019-12-28T23:48:58.3737352Z .................................................................................................... 7800/9462
2019-12-28T23:49:06.0748940Z ...............................iiii................................................................. 7900/9462
2019-12-28T23:49:20.8581948Z .................................................................................................... 8100/9462
2019-12-28T23:49:29.6469985Z .................................................................................................... 8200/9462
2019-12-28T23:49:44.0383680Z .................................................................................................... 8300/9462
2019-12-28T23:49:51.5541664Z .................................................................................................... 8400/9462
---
2019-12-28T23:52:12.8512922Z  finished in 6.603
2019-12-28T23:52:12.8709110Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-28T23:52:13.0591746Z 
2019-12-28T23:52:13.0592634Z running 166 tests
2019-12-28T23:52:16.1450121Z iiii......i........ii..iiii...i.............................i..i..................i....i............ 100/166
2019-12-28T23:52:18.2730425Z i.i.i...iii..iiiiiii.......................iii............ii......
2019-12-28T23:52:18.2732383Z 
2019-12-28T23:52:18.2737398Z  finished in 5.403
2019-12-28T23:52:18.2936449Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-28T23:52:18.4635940Z 
---
2019-12-28T23:52:20.4589259Z  finished in 2.165
2019-12-28T23:52:20.4793233Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-28T23:52:20.6457683Z 
2019-12-28T23:52:20.6457989Z running 9 tests
2019-12-28T23:52:20.6458856Z iiiiiiiii
2019-12-28T23:52:20.6459264Z 
2019-12-28T23:52:20.6459338Z  finished in 0.166
2019-12-28T23:52:20.6658890Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-28T23:52:20.8469359Z 
---
2019-12-28T23:52:40.3071938Z  finished in 19.641
2019-12-28T23:52:40.3308935Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-28T23:52:40.5274847Z 
2019-12-28T23:52:40.5275082Z running 124 tests
2019-12-28T23:53:05.4679823Z .iiiii..ii.....i..i...i..i.i.i..i..i..iii....ii.ii....ii..........iiii..........i.....i..ii.......ii 100/124
2019-12-28T23:53:09.7210431Z .i.iii.....iiiiii.....ii
2019-12-28T23:53:09.7211716Z 
2019-12-28T23:53:09.7216201Z  finished in 29.391
2019-12-28T23:53:09.7221225Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-28T23:53:09.7224940Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-12-29T00:07:01.2848536Z 
2019-12-29T00:07:01.2852045Z    Doc-tests core
2019-12-29T00:07:06.0783509Z 
2019-12-29T00:07:06.0784505Z running 2439 tests
2019-12-29T00:07:15.5166506Z ......iiiii......................................................................................... 100/2439
2019-12-29T00:07:24.3611876Z ..................................................................................ii................ 200/2439
2019-12-29T00:07:45.3088457Z ................i................................................................................... 400/2439
2019-12-29T00:07:45.3088457Z ................i................................................................................... 400/2439
2019-12-29T00:07:54.8352802Z ................................................................i..i..................iiii.......... 500/2439
2019-12-29T00:08:11.2970535Z .................................................................................................... 700/2439
2019-12-29T00:08:19.9039437Z .................................................................................................... 800/2439
2019-12-29T00:08:28.5932927Z .................................................................................................... 900/2439
2019-12-29T00:08:37.2483993Z .................................................................................................... 1000/2439
---
2019-12-29T00:12:12.5952838Z .................................................thread '<unnamed>' panicked at 'explicit panic', src/libstd/io/stdio.rs:871:13
2019-12-29T00:12:12.5953054Z ... 300/760
2019-12-29T00:12:12.5953169Z .................................................................................................... 400/760
2019-12-29T00:12:13.9559752Z .................................................................................................... 500/760
2019-12-29T00:12:13.9897854Z .................thread '<unnamed>.' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1189:5
2019-12-29T00:12:13.9913920Z ....thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: "SendError(..)"', src/libcore/result.rs:1189:5
2019-12-29T00:12:13.9925886Z ..thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1189:5
2019-12-29T00:12:13.9943256Z ....thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1189:5
2019-12-29T00:12:14.2013796Z ..........................................thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1189:5
2019-12-29T00:12:14.2031704Z ....thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1189:5
2019-12-29T00:12:14.2068755Z .......thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1189:5
2019-12-29T00:12:14.2313751Z ................... 600/760
2019-12-29T00:12:16.2709326Z .....................thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/mutex.rs:633:13
2019-12-29T00:12:16.2712130Z thread '<unnamed>' panicked at 'test panic in inner thread to poison mutex', src/libstd/sync/mutex.rs:587:13
---
2019-12-29T00:12:25.5623193Z 
2019-12-29T00:12:25.5623486Z running 1002 tests
2019-12-29T00:12:43.6773462Z i................................................................................................... 100/1002
2019-12-29T00:12:53.6892649Z .................................................................................................... 200/1002
2019-12-29T00:13:00.7871432Z .................iii......i......i...i......i....................................................... 300/1002
2019-12-29T00:13:05.6682202Z .................................................................................................... 400/1002
2019-12-29T00:13:12.5323321Z .........................................i..i.....................................ii................ 500/1002
2019-12-29T00:13:25.2175939Z .................................................................................................... 700/1002
2019-12-29T00:13:25.2175939Z .................................................................................................... 700/1002
2019-12-29T00:13:31.8284133Z ............................iiii.................................................................... 800/1002
2019-12-29T00:13:45.9379488Z .................................................................................................... 900/1002
2019-12-29T00:13:53.1175373Z ..................................................iiii.............................................. 1000/1002
2019-12-29T00:13:53.1189432Z test result: ok. 982 passed; 0 failed; 20 ignored; 0 measured; 0 filtered out
2019-12-29T00:13:53.1189473Z 
2019-12-29T00:13:53.1189542Z  finished in 182.191
2019-12-29T00:13:53.1190405Z Testing term stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---
2019-12-29T00:16:42.0594955Z running 4 tests
2019-12-29T00:16:42.1473605Z FFFF
2019-12-29T00:16:42.1473737Z failures:
2019-12-29T00:16:42.1473768Z 
2019-12-29T00:16:42.1474516Z ---- region.rs - region::resolve_local::is_binding_pat (line 515) stdout ----
2019-12-29T00:16:42.1474574Z error: expected expression, found `=`
2019-12-29T00:16:42.1474808Z  --> region.rs:516:4
2019-12-29T00:16:42.1474853Z   |
2019-12-29T00:16:42.1474895Z 3 | P& = ref X
2019-12-29T00:16:42.1474985Z 
2019-12-29T00:16:42.1475028Z error: aborting due to previous error
2019-12-29T00:16:42.1475057Z 
2019-12-29T00:16:42.1475261Z Couldn't compile the test.
2019-12-29T00:16:42.1475261Z Couldn't compile the test.
2019-12-29T00:16:42.1475909Z ---- region.rs - region::resolve_local::record_rvalue_scope (line 626) stdout ----
2019-12-29T00:16:42.1475960Z error: unexpected token: `...`
2019-12-29T00:16:42.1476153Z  --> region.rs:628:9
2019-12-29T00:16:42.1476211Z   |
2019-12-29T00:16:42.1476250Z 4 |    | ET[...]
2019-12-29T00:16:42.1476344Z   |
2019-12-29T00:16:42.1476396Z help: use `..` for an exclusive range
2019-12-29T00:16:42.1476436Z   |
2019-12-29T00:16:42.1476591Z 4 |    | ET[..]
2019-12-29T00:16:42.1476591Z 4 |    | ET[..]
2019-12-29T00:16:42.1476648Z   |         ^^
2019-12-29T00:16:42.1476690Z help: or `..=` for an inclusive range
2019-12-29T00:16:42.1476730Z   |
2019-12-29T00:16:42.1476785Z 4 |    | ET[..=]
2019-12-29T00:16:42.1476851Z 
2019-12-29T00:16:42.1476893Z error[E0586]: inclusive range with no end
2019-12-29T00:16:42.1477116Z  --> region.rs:628:12
2019-12-29T00:16:42.1477160Z   |
2019-12-29T00:16:42.1477160Z   |
2019-12-29T00:16:42.1477198Z 4 |    | ET[...]
2019-12-29T00:16:42.1477301Z   |
2019-12-29T00:16:42.1477301Z   |
2019-12-29T00:16:42.1477347Z   = help: inclusive ranges must be bounded at the end (`..=b` or `a..=b`)
2019-12-29T00:16:42.1477436Z error: aborting due to 2 previous errors
2019-12-29T00:16:42.1477464Z 
2019-12-29T00:16:42.1477712Z For more information about this error, try `rustc --explain E0586`.
2019-12-29T00:16:42.1478030Z Couldn't compile the test.
2019-12-29T00:16:42.1478030Z Couldn't compile the test.
2019-12-29T00:16:42.1478458Z ---- resolve_lifetime.rs - resolve_lifetime::Scope::Binder::opaque_type_parent (line 125) stdout ----
2019-12-29T00:16:42.1478518Z error: expected one of `+`, `::`, `where`, or `{`, found `}`
2019-12-29T00:16:42.1478731Z  --> resolve_lifetime.rs:127:1
2019-12-29T00:16:42.1478792Z   |
2019-12-29T00:16:42.1479027Z 3 | fn foo<'a>() -> impl for<'b> Trait<Item = impl Trait2<'a>>
2019-12-29T00:16:42.1479815Z   |                                                           - expected one of `+`, `::`, `where`, or `{`
2019-12-29T00:16:42.1480030Z   | ^ unexpected token
2019-12-29T00:16:42.1480065Z 
2019-12-29T00:16:42.1480115Z error: aborting due to previous error
2019-12-29T00:16:42.1480166Z 
2019-12-29T00:16:42.1480166Z 
2019-12-29T00:16:42.1480450Z Couldn't compile the test.
2019-12-29T00:16:42.1480765Z ---- region.rs - region::resolve_local::record_rvalue_scope_if_borrow_expr (line 578) stdout ----
2019-12-29T00:16:42.1480851Z error: expected expression, found `=`
2019-12-29T00:16:42.1481080Z  --> region.rs:579:4
2019-12-29T00:16:42.1481132Z   |
2019-12-29T00:16:42.1481178Z 3 | E& = & ET
2019-12-29T00:16:42.1481276Z 
2019-12-29T00:16:42.1481321Z error: aborting due to previous error
2019-12-29T00:16:42.1481353Z 
2019-12-29T00:16:42.1481594Z Couldn't compile the test.
2019-12-29T00:16:42.1481594Z Couldn't compile the test.
2019-12-29T00:16:42.1481628Z 
2019-12-29T00:16:42.1481672Z failures:
2019-12-29T00:16:42.1481957Z     region.rs - region::resolve_local::is_binding_pat (line 515)
2019-12-29T00:16:42.1482239Z     region.rs - region::resolve_local::record_rvalue_scope (line 626)
2019-12-29T00:16:42.1482542Z     region.rs - region::resolve_local::record_rvalue_scope_if_borrow_expr (line 578)
2019-12-29T00:16:42.1482858Z     resolve_lifetime.rs - resolve_lifetime::Scope::Binder::opaque_type_parent (line 125)
2019-12-29T00:16:42.1482950Z test result: FAILED. 0 passed; 4 failed; 0 ignored; 0 measured; 0 filtered out
2019-12-29T00:16:42.1482994Z 
2019-12-29T00:16:42.1531333Z error: test failed, to rerun pass '--doc'
2019-12-29T00:16:42.1549281Z 
2019-12-29T00:16:42.1549281Z 
2019-12-29T00:16:42.1549587Z 
2019-12-29T00:16:42.1552677Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "-Zconfig-profile" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--locked" "--color" "always" "--features" " llvm" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "-p" "rustc_passes" "--" "--quiet"
2019-12-29T00:16:42.1553060Z 
2019-12-29T00:16:42.1553093Z 
2019-12-29T00:16:42.1568513Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-12-29T00:16:42.1568611Z Build completed unsuccessfully in 1:31:11
2019-12-29T00:16:42.1568611Z Build completed unsuccessfully in 1:31:11
2019-12-29T00:16:42.1626855Z == clock drift check ==
2019-12-29T00:16:42.1645051Z   local time: Sun Dec 29 00:16:42 UTC 2019
2019-12-29T00:16:42.4506964Z   network time: Sun, 29 Dec 2019 00:16:42 GMT
2019-12-29T00:16:42.4507077Z == end clock drift check ==
2019-12-29T00:16:43.1159256Z 
2019-12-29T00:16:43.1319403Z ##[error]Bash exited with code '1'.
2019-12-29T00:16:43.1358002Z ##[section]Starting: Checkout
2019-12-29T00:16:43.1360256Z ==============================================================================
2019-12-29T00:16:43.1360328Z Task         : Get sources
2019-12-29T00:16:43.1360374Z 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)

Zoxc · 2019-12-29T00:29:39Z

src/librustc/lib.rs

Maybe split this out to middle.rs?

Zoxc · 2019-12-29T00:38:57Z

Move resolve_lifetimes query in librustc_passes. and Move region_scope_tree query to librustc_passes. should probably each get their own PRs. It probably make sense to make a commit to move the files and then copy back stuff to rustc (that would seem to cause less conflict since most of it is moved).

cc @Centril

Zoxc · 2019-12-29T00:50:32Z

src/librustc/middle/weak_lang_items.rs

Any particular reason you where unable to move the entire file?

librustc_codegen_ssa depends on the link_name function. I did not want to introduce a dependency on librustc_passes just for that.

I'd just add that dependency instead of keeping stuff in rustc.

Please, don't introduce the dependency, it's a much larger build time penalty than a tiny function in rustc.

That is not true though.

Maybe make a rustc_lang_items and put that as a librustc_codegen_ssa dependency instead?

rustc_lang_items is probably sensible long term, also because I'd like to be able to refer to lang items in lowering (#60607).

Let's just move these to a new rustc_lang_items crate then.

Zoxc · 2019-12-29T00:57:45Z

The first 4 commits look good, you could split them off into a separate PR so I can approve them.

I'd like the stability.rs changes in a separate PR too.

Centril · 2019-12-29T01:01:21Z

It probably make sense to make a commit to move the files and then copy back stuff to rustc (that would seem to cause less conflict since most of it is moved).

👍 -- this tends to work well with git so as to preserve blame and history.

cjgillot · 2019-12-29T13:35:50Z

Rebased, with the split-out commits removed.

Zoxc · 2019-12-29T15:11:29Z

Maybe move the non lang-items commits to #67698 too, they should be good to go.

@Zoxc

Move reachable_set and diagnostic_items to librustc_passes. Split out of rust-lang#67688 r? @Zoxc

bors · 2019-12-30T08:24:05Z

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

@Zoxc

Move the region_scope_tree query to librustc_passes. Split out of rust-lang#67688. r? @Zoxc

@Zoxc

Move the region_scope_tree query to librustc_passes. Split out of rust-lang#67688. r? @Zoxc

@Zoxc

Move resolve_lifetimes query in librustc_resolve. Split out of #67688 r? @Zoxc

@Zoxc

Move stability queries to librustc_passes. Contains: - check_mod_unstable_api_usage query; - stability_index query; - check_unused_or_stable features pass. Split out of #67688 r? @Zoxc

bors · 2020-01-02T07:04:24Z

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

Zoxc · 2020-01-02T16:21:25Z

I see you added some more stuff here. check_addr can be moved to its own PR. I'm not sure where upvars should go though.

bors · 2020-01-06T16:07:09Z

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

Dylan-DPC-zz · 2020-01-16T17:33:37Z

@cjgillot can you rebase this? thanks

cjgillot · 2020-01-16T20:39:19Z

Rebased.

rust-highfive · 2020-01-16T21:17:51Z

The job x86_64-gnu-llvm-7 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.

2020-01-16T20:06:48.2310770Z ========================== Starting Command Output ===========================
2020-01-16T20:06:48.2312227Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/f4a560de-d659-4b70-a36c-943dceb8f175.sh
2020-01-16T20:06:48.2312262Z 
2020-01-16T20:06:48.2314844Z ##[section]Finishing: Disable git automatic line ending conversion
2020-01-16T20:06:48.2321395Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/67688/merge to s
2020-01-16T20:06:48.2323037Z Task         : Get sources
2020-01-16T20:06:48.2323069Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-01-16T20:06:48.2323194Z Version      : 1.0.0
2020-01-16T20:06:48.2323276Z Author       : Microsoft
---
2020-01-16T20:06:49.2145723Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-01-16T20:06:49.2157121Z ##[command]git config gc.auto 0
2020-01-16T20:06:49.2160498Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-01-16T20:06:49.2166203Z ##[command]git config --get-all http.proxy
2020-01-16T20:06:49.2175096Z ##[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/67688/merge:refs/remotes/pull/67688/merge
---
2020-01-16T21:05:23.9310958Z .................................................................................................... 1700/9524
2020-01-16T21:05:32.6722130Z .................................................................................................... 1800/9524
2020-01-16T21:05:42.6474702Z ...........i........................................................................................ 1900/9524
2020-01-16T21:05:50.0738490Z .................................................................................................... 2000/9524
2020-01-16T21:06:07.3131614Z .iiiii..........................................................................F................... 2100/9524
2020-01-16T21:06:16.1336702Z ......................................F............................................................. 2300/9524
2020-01-16T21:06:18.6738682Z .................................................................................................... 2400/9524
2020-01-16T21:06:24.5577884Z .................................................................................................... 2500/9524
2020-01-16T21:06:46.1793881Z .................................................................................................... 2600/9524
---
2020-01-16T21:09:35.6582804Z ............................................i...............i....................................... 4900/9524
2020-01-16T21:09:45.0254884Z .................................................................................................... 5000/9524
2020-01-16T21:09:52.3234926Z .......................................................................................i............ 5100/9524
2020-01-16T21:09:57.7618082Z .................................................................................................... 5200/9524
2020-01-16T21:10:09.1660772Z ...........................................................ii.ii...........i........................ 5300/9524
2020-01-16T21:10:18.7053952Z .................................................................................................... 5500/9524
2020-01-16T21:10:29.3121982Z .................................................................................................... 5600/9524
2020-01-16T21:10:36.0511117Z ............................................i....................................................... 5700/9524
2020-01-16T21:10:43.2462357Z .................................................................................................... 5800/9524
2020-01-16T21:10:43.2462357Z .................................................................................................... 5800/9524
2020-01-16T21:10:54.4519338Z .................................................................................................... 5900/9524
2020-01-16T21:11:04.3113087Z ...................................ii...i...ii..........i........................................... 6000/9524
2020-01-16T21:11:24.3504904Z .................................................................................................... 6200/9524
2020-01-16T21:11:32.9123357Z .................................................................................................... 6300/9524
2020-01-16T21:11:32.9123357Z .................................................................................................... 6300/9524
2020-01-16T21:11:42.1304568Z ...............................................................i..ii................................ 6400/9524
2020-01-16T21:12:12.2306641Z ......................................................................F.F........................... 6600/9524
2020-01-16T21:12:14.6172051Z .......................................i............................................................ 6700/9524
2020-01-16T21:12:16.8908459Z .................................................................................................... 6800/9524
2020-01-16T21:12:19.5608302Z .......................................i............................................................ 6900/9524
---
2020-01-16T21:14:03.1788063Z .................................................................................................... 7500/9524
2020-01-16T21:14:07.8450726Z .................................................................................................... 7600/9524
2020-01-16T21:14:14.2471617Z .................................................................................................... 7700/9524
2020-01-16T21:14:21.3066171Z .................................................................................................... 7800/9524
2020-01-16T21:14:32.0631112Z .........................................................................................iiii....... 7900/9524
2020-01-16T21:14:49.5846898Z ......................i......i...................................................................... 8100/9524
2020-01-16T21:14:54.9063713Z .................................................................................................... 8200/9524
2020-01-16T21:15:08.6805445Z .................................................................................................... 8300/9524
2020-01-16T21:15:20.0587103Z .................................................................................................... 8400/9524
---
2020-01-16T21:17:27.7897543Z 
2020-01-16T21:17:27.7898803Z ---- [ui] ui/duplicate_entry_error.rs stdout ----
2020-01-16T21:17:27.7898873Z diff of stderr:
2020-01-16T21:17:27.7898935Z 
2020-01-16T21:17:27.7899558Z - error[E0152]: found duplicate lang item `panic_impl`
2020-01-16T21:17:27.7900333Z + error[E0152]: duplicate lang item found: `panic_impl`.
2020-01-16T21:17:27.7900734Z 3    |
2020-01-16T21:17:27.7900734Z 3    |
2020-01-16T21:17:27.7900985Z 4 LL | / fn panic_impl(info: &PanicInfo) -> ! {
2020-01-16T21:17:27.7901823Z 
2020-01-16T21:17:27.7901887Z The actual stderr differed from the expected stderr.
2020-01-16T21:17:27.7902354Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/duplicate_entry_error/duplicate_entry_error.stderr
2020-01-16T21:17:27.7902354Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/duplicate_entry_error/duplicate_entry_error.stderr
2020-01-16T21:17:27.7902900Z To update references, rerun the tests and pass the `--bless` flag
2020-01-16T21:17:27.7903407Z To only update this specific test, also pass `--test-args duplicate_entry_error.rs`
2020-01-16T21:17:27.7903706Z error: 1 errors occurred comparing output.
2020-01-16T21:17:27.7903757Z status: exit code: 1
2020-01-16T21:17:27.7903757Z status: exit code: 1
2020-01-16T21:17:27.7905165Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/duplicate_entry_error.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/duplicate_entry_error" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/duplicate_entry_error/auxiliary" "-A" "unused"
2020-01-16T21:17:27.7911322Z ------------------------------------------
2020-01-16T21:17:27.7911547Z 
2020-01-16T21:17:27.7911917Z ------------------------------------------
2020-01-16T21:17:27.7912034Z stderr:
2020-01-16T21:17:27.7912034Z stderr:
2020-01-16T21:17:27.7912928Z ------------------------------------------
2020-01-16T21:17:27.7913156Z error[E0152]: duplicate lang item found: `panic_impl`.
2020-01-16T21:17:27.7913736Z    |
2020-01-16T21:17:27.7913736Z    |
2020-01-16T21:17:27.7946621Z LL | / fn panic_impl(info: &PanicInfo) -> ! {
2020-01-16T21:17:27.7949273Z LL | | //~^ ERROR: found duplicate lang item `panic_impl`
2020-01-16T21:17:27.7949412Z LL | | }
2020-01-16T21:17:27.7949456Z    | |_^
2020-01-16T21:17:27.7949518Z    |
2020-01-16T21:17:27.7949518Z    |
2020-01-16T21:17:27.7949572Z    = note: first defined in crate `std` (which `duplicate_entry_error` depends on)
2020-01-16T21:17:27.7949700Z error: aborting due to previous error
2020-01-16T21:17:27.7949733Z 
2020-01-16T21:17:27.7950169Z For more information about this error, try `rustc --explain E0152`.
2020-01-16T21:17:27.7950217Z 
2020-01-16T21:17:27.7950217Z 
2020-01-16T21:17:27.7950482Z ------------------------------------------
2020-01-16T21:17:27.7950517Z 
2020-01-16T21:17:27.7950544Z 
2020-01-16T21:17:27.7950790Z ---- [ui] ui/error-codes/E0152.rs stdout ----
2020-01-16T21:17:27.7950840Z diff of stderr:
2020-01-16T21:17:27.7950888Z 
2020-01-16T21:17:27.7951134Z - error[E0152]: found duplicate lang item `arc`
2020-01-16T21:17:27.7951188Z + error[E0152]: duplicate lang item found: `arc`.
2020-01-16T21:17:27.7951430Z 2   --> $DIR/E0152.rs:4:1
2020-01-16T21:17:27.7951524Z 4 LL | struct Foo;
2020-01-16T21:17:27.7951554Z 
2020-01-16T21:17:27.7951598Z 
2020-01-16T21:17:27.7951647Z The actual stderr differed from the expected stderr.
2020-01-16T21:17:27.7951647Z The actual stderr differed from the expected stderr.
2020-01-16T21:17:27.7951968Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/error-codes/E0152/E0152.stderr
2020-01-16T21:17:27.7952497Z To update references, rerun the tests and pass the `--bless` flag
2020-01-16T21:17:27.7952909Z To only update this specific test, also pass `--test-args error-codes/E0152.rs`
2020-01-16T21:17:27.7953008Z error: 1 errors occurred comparing output.
2020-01-16T21:17:27.7953076Z status: exit code: 1
2020-01-16T21:17:27.7953076Z status: exit code: 1
2020-01-16T21:17:27.7954519Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/error-codes/E0152.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/error-codes/E0152" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/error-codes/E0152/auxiliary" "-A" "unused"
2020-01-16T21:17:27.7955040Z ------------------------------------------
2020-01-16T21:17:27.7955078Z 
2020-01-16T21:17:27.7955349Z ------------------------------------------
2020-01-16T21:17:27.7955399Z stderr:
2020-01-16T21:17:27.7955399Z stderr:
2020-01-16T21:17:27.7955633Z ------------------------------------------
2020-01-16T21:17:27.7955705Z error[E0152]: duplicate lang item found: `arc`.
2020-01-16T21:17:27.7956012Z    |
2020-01-16T21:17:27.7956077Z LL | struct Foo; //~ ERROR E0152
2020-01-16T21:17:27.7956126Z    | ^^^^^^^^^^^
2020-01-16T21:17:27.7956170Z    |
---
2020-01-16T21:17:27.7956982Z 
2020-01-16T21:17:27.7957266Z ---- [ui] ui/panic-handler/panic-handler-duplicate.rs stdout ----
2020-01-16T21:17:27.7957322Z diff of stderr:
2020-01-16T21:17:27.7957351Z 
2020-01-16T21:17:27.7957604Z - error[E0152]: found duplicate lang item `panic_impl`
2020-01-16T21:17:27.7957679Z + error[E0152]: duplicate lang item found: `panic_impl`.
2020-01-16T21:17:27.7957974Z 3    |
2020-01-16T21:17:27.7957974Z 3    |
2020-01-16T21:17:27.7958229Z 4 LL | / fn panic2(info: &PanicInfo) -> ! {
2020-01-16T21:17:27.7958291Z 
2020-01-16T21:17:27.7958340Z The actual stderr differed from the expected stderr.
2020-01-16T21:17:27.7958719Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/panic-handler/panic-handler-duplicate/panic-handler-duplicate.stderr
2020-01-16T21:17:27.7958719Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/panic-handler/panic-handler-duplicate/panic-handler-duplicate.stderr
2020-01-16T21:17:27.7958995Z To update references, rerun the tests and pass the `--bless` flag
2020-01-16T21:17:27.7959314Z To only update this specific test, also pass `--test-args panic-handler/panic-handler-duplicate.rs`
2020-01-16T21:17:27.7959426Z error: 1 errors occurred comparing output.
2020-01-16T21:17:27.7959475Z status: exit code: 1
2020-01-16T21:17:27.7959475Z status: exit code: 1
2020-01-16T21:17:27.7961064Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/panic-handler/panic-handler-duplicate.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/panic-handler/panic-handler-duplicate" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-C" "panic=abort" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/panic-handler/panic-handler-duplicate/auxiliary" "-A" "unused"
2020-01-16T21:17:27.7961661Z ------------------------------------------
2020-01-16T21:17:27.7961698Z 
2020-01-16T21:17:27.7961936Z ------------------------------------------
2020-01-16T21:17:27.7962095Z stderr:
2020-01-16T21:17:27.7962095Z stderr:
2020-01-16T21:17:27.7962375Z ------------------------------------------
2020-01-16T21:17:27.7962429Z error[E0152]: duplicate lang item found: `panic_impl`.
2020-01-16T21:17:27.7962779Z    |
2020-01-16T21:17:27.7962779Z    |
2020-01-16T21:17:27.7963072Z LL | / fn panic2(info: &PanicInfo) -> ! { //~ ERROR found duplicate lang item `panic_impl`
2020-01-16T21:17:27.7963190Z LL | | }
2020-01-16T21:17:27.7963233Z    | |_^
2020-01-16T21:17:27.7963275Z    |
2020-01-16T21:17:27.7963338Z note: first defined here
2020-01-16T21:17:27.7963338Z note: first defined here
2020-01-16T21:17:27.7963612Z   --> /checkout/src/test/ui/panic-handler/panic-handler-duplicate.rs:10:1
2020-01-16T21:17:27.7963674Z    |
2020-01-16T21:17:27.7963921Z LL | / fn panic(info: &PanicInfo) -> ! {
2020-01-16T21:17:27.7964343Z LL | | }
2020-01-16T21:17:27.7964385Z    | |_^
2020-01-16T21:17:27.7964434Z 
2020-01-16T21:17:27.7964491Z error: aborting due to previous error
---
2020-01-16T21:17:27.7965230Z 
2020-01-16T21:17:27.7965500Z ---- [ui] ui/panic-handler/panic-handler-std.rs stdout ----
2020-01-16T21:17:27.7965552Z diff of stderr:
2020-01-16T21:17:27.7965583Z 
2020-01-16T21:17:27.7965832Z - error[E0152]: found duplicate lang item `panic_impl`
2020-01-16T21:17:27.7965905Z + error[E0152]: duplicate lang item found: `panic_impl`.
2020-01-16T21:17:27.7966198Z 3    |
2020-01-16T21:17:27.7966198Z 3    |
2020-01-16T21:17:27.7966453Z 4 LL | / fn panic(info: PanicInfo) -> ! {
2020-01-16T21:17:27.7966514Z 
2020-01-16T21:17:27.7966562Z The actual stderr differed from the expected stderr.
2020-01-16T21:17:27.7966929Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/panic-handler/panic-handler-std/panic-handler-std.stderr
2020-01-16T21:17:27.7966929Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/panic-handler/panic-handler-std/panic-handler-std.stderr
2020-01-16T21:17:27.7967207Z To update references, rerun the tests and pass the `--bless` flag
2020-01-16T21:17:27.7967545Z To only update this specific test, also pass `--test-args panic-handler/panic-handler-std.rs`
2020-01-16T21:17:27.7967658Z error: 1 errors occurred comparing output.
2020-01-16T21:17:27.7967708Z status: exit code: 1
2020-01-16T21:17:27.7967708Z status: exit code: 1
2020-01-16T21:17:27.7968677Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/panic-handler/panic-handler-std.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/panic-handler/panic-handler-std" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/panic-handler/panic-handler-std/auxiliary" "-A" "unused"
2020-01-16T21:17:27.7969079Z ------------------------------------------
2020-01-16T21:17:27.7969117Z 
2020-01-16T21:17:27.7969379Z ------------------------------------------
2020-01-16T21:17:27.7969431Z stderr:
2020-01-16T21:17:27.7969431Z stderr:
2020-01-16T21:17:27.7969704Z ------------------------------------------
2020-01-16T21:17:27.7969761Z error[E0152]: duplicate lang item found: `panic_impl`.
2020-01-16T21:17:27.7970124Z    |
2020-01-16T21:17:27.7970124Z    |
2020-01-16T21:17:27.7970379Z LL | / fn panic(info: PanicInfo) -> ! {
2020-01-16T21:17:27.7970645Z LL | | }
2020-01-16T21:17:27.7970691Z    | |_^
2020-01-16T21:17:27.7970735Z    |
2020-01-16T21:17:27.7970735Z    |
2020-01-16T21:17:27.7970874Z    = note: first defined in crate `std` (which `panic_handler_std` depends on)
2020-01-16T21:17:27.7970969Z error: argument should be `&PanicInfo`
2020-01-16T21:17:27.7971300Z   --> /checkout/src/test/ui/panic-handler/panic-handler-std.rs:7:16
2020-01-16T21:17:27.7971375Z    |
2020-01-16T21:17:27.7971375Z    |
2020-01-16T21:17:27.7971628Z LL | fn panic(info: PanicInfo) -> ! {
2020-01-16T21:17:27.7971716Z 
2020-01-16T21:17:27.7971781Z error: aborting due to 2 previous errors
2020-01-16T21:17:27.7971813Z 
2020-01-16T21:17:27.7972100Z For more information about this error, try `rustc --explain E0152`.
---
2020-01-16T21:17:27.7974571Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:387:22
2020-01-16T21:17:27.7974650Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-01-16T21:17:27.7999287Z 
2020-01-16T21:17:27.8001056Z 
2020-01-16T21:17:27.8007850Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-7/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "7.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2020-01-16T21:17:27.8008186Z 
2020-01-16T21:17:27.8008227Z 
2020-01-16T21:17:27.8017759Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2020-01-16T21:17:27.8017845Z Build completed unsuccessfully in 1:04:47
2020-01-16T21:17:27.8017845Z Build completed unsuccessfully in 1:04:47
2020-01-16T21:17:27.8075425Z == clock drift check ==
2020-01-16T21:17:27.8104689Z   local time: Thu Jan 16 21:17:27 UTC 2020
2020-01-16T21:17:27.9788931Z   network time: Thu, 16 Jan 2020 21:17:27 GMT
2020-01-16T21:17:27.9789349Z == end clock drift check ==
2020-01-16T21:17:28.5892899Z 
2020-01-16T21:17:28.6000951Z ##[error]Bash exited with code '1'.
2020-01-16T21:17:28.6013056Z ##[section]Finishing: Run build
2020-01-16T21:17:28.6032562Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/67688/merge to s
2020-01-16T21:17:28.6034863Z Task         : Get sources
2020-01-16T21:17:28.6034908Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-01-16T21:17:28.6034970Z Version      : 1.0.0
2020-01-16T21:17:28.6035011Z Author       : Microsoft
2020-01-16T21:17:28.6035011Z Author       : Microsoft
2020-01-16T21:17:28.6035055Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-01-16T21:17:28.6035121Z ==============================================================================
2020-01-16T21:17:29.0503829Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-01-16T21:17:29.0545121Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/67688/merge to s
2020-01-16T21:17:29.0667066Z Cleaning up task key
2020-01-16T21:17:29.0667822Z Start cleaning up orphan processes.
2020-01-16T21:17:29.0792175Z Terminate orphan process: pid (3454) (python)
2020-01-16T21:17:29.1032810Z ##[section]Finishing: Finalize Job

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)

bors · 2020-01-18T04:45:10Z

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

JohnCSimon · 2020-01-26T05:27:36Z

Ping from triage:
@cjgillot can you rebase this this again and fix the build errors? Thanks.

cjgillot · 2020-01-26T17:27:33Z

Rebased with lang_items changes moved to #68554.

Zoxc · 2020-01-27T16:02:47Z

src/librustc_passes/check_attr.rs

I think this method can just stay in rustc.

This method is only used in this file. Since I plan to remove rustc::hir::check_attr in #68554, I think I will make it a free function.

bors · 2020-01-29T16:39:56Z

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

Zoxc · 2020-01-29T22:25:26Z

@bors r+

bors · 2020-01-29T22:25:27Z

📌 Commit f9335e9 has been approved by Zoxc

bors · 2020-01-29T23:10:05Z

⌛ Testing commit f9335e9 with merge dc92dfc...

@Zoxc

Move some code to librustc_passes. Per instructions by @Zoxc, some code from `librustc::middle` is moved to `librustc_passes`. cc #65031 r? @Zoxc

bors · 2020-01-30T02:25:50Z

☀️ Test successful - checks-azure
Approved by: Zoxc
Pushing dc92dfc to master...

Split lang_items to crates `rustc_hir` and `rustc_passes`. As discussed in comment rust-lang#67688 (comment)

rust-highfive assigned Zoxc Dec 28, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 28, 2019

Zoxc reviewed Dec 29, 2019

View reviewed changes

src/librustc/lib.rs Outdated

Copy link

Contributor

Zoxc Dec 29, 2019

Choose a reason for hiding this comment

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

Maybe split this out to middle.rs?

Zoxc reviewed Dec 29, 2019

View reviewed changes

petrochenkov self-assigned this Dec 29, 2019

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 Dec 29, 2019

petrochenkov removed their assignment Dec 29, 2019

cjgillot force-pushed the passes branch from b33e6a8 to 3b8a738 Compare December 29, 2019 13:35

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Dec 30, 2019

Rollup merge of rust-lang#67698 - cjgillot:passes-first, r=Zoxc

88e322c

Move reachable_set and diagnostic_items to librustc_passes. Split out of rust-lang#67688 r? @Zoxc

cjgillot force-pushed the passes branch from 3b8a738 to 6ebefcf Compare December 30, 2019 22:58

Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Dec 31, 2019

Rollup merge of rust-lang#67697 - cjgillot:passes-scope-tree, r=Zoxc

8837235

Move the region_scope_tree query to librustc_passes. Split out of rust-lang#67688. r? @Zoxc

Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Dec 31, 2019

Rollup merge of rust-lang#67697 - cjgillot:passes-scope-tree, r=Zoxc

83f5cf8

Move the region_scope_tree query to librustc_passes. Split out of rust-lang#67688. r? @Zoxc

bors added a commit that referenced this pull request Dec 31, 2019

Auto merge of #67699 - cjgillot:passes-resolve, r=Zoxc

769eb21

Move resolve_lifetimes query in librustc_resolve. Split out of #67688 r? @Zoxc

cjgillot force-pushed the passes branch from 6ebefcf to 018af96 Compare January 1, 2020 16:39

cjgillot force-pushed the passes branch from 018af96 to 155dbd4 Compare January 5, 2020 15:43

cjgillot force-pushed the passes branch from 155dbd4 to baed903 Compare January 16, 2020 20:06

cjgillot mentioned this pull request Jan 26, 2020

Split lang_items to crates rustc_hir and rustc_passes. #68554

Merged

cjgillot force-pushed the passes branch from baed903 to fe67c87 Compare January 26, 2020 17:12

Zoxc reviewed Jan 27, 2020

View reviewed changes

cjgillot added 5 commits January 29, 2020 19:27

Move check_attr.rs to librustc_passes.

f0a8991

Move check_mod_attr query in librustc_passes.

1b7e79a

Move upvars.rs to librustc_passes.

62c2c99

Move upvars query to librustc_passes.

124fd9d

Make Target::from_impl_item a free function.

f9335e9

cjgillot force-pushed the passes branch from fe67c87 to 124fd9d Compare January 29, 2020 18:45

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 29, 2020

bors added a commit that referenced this pull request Jan 29, 2020

Auto merge of #67688 - cjgillot:passes, r=Zoxc

dc92dfc

Move some code to librustc_passes. Per instructions by @Zoxc, some code from `librustc::middle` is moved to `librustc_passes`. cc #65031 r? @Zoxc

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 30, 2020

bors merged commit f9335e9 into rust-lang:master Jan 30, 2020

cjgillot deleted the passes branch January 30, 2020 07:56

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Feb 12, 2020

Rollup merge of rust-lang#68554 - cjgillot:lang_items, r=Zoxc

19b0c00

Split lang_items to crates `rustc_hir` and `rustc_passes`. As discussed in comment rust-lang#67688 (comment)

Uh oh!

Conversation

cjgillot commented Dec 28, 2019

Uh oh!

rust-highfive commented Dec 29, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Zoxc commented Dec 29, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Zoxc commented Dec 29, 2019

Uh oh!

Centril commented Dec 29, 2019

Uh oh!

cjgillot commented Dec 29, 2019

Uh oh!

Zoxc commented Dec 29, 2019

Uh oh!

bors commented Dec 30, 2019

Uh oh!

bors commented Jan 2, 2020

Uh oh!

Zoxc commented Jan 2, 2020

Uh oh!

bors commented Jan 6, 2020

Uh oh!

Dylan-DPC-zz commented Jan 16, 2020

Uh oh!

cjgillot commented Jan 16, 2020

Uh oh!

rust-highfive commented Jan 16, 2020

Uh oh!

bors commented Jan 18, 2020

Uh oh!

JohnCSimon commented Jan 26, 2020

Uh oh!

cjgillot commented Jan 26, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cjgillot Jan 27, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bors commented Jan 29, 2020

Uh oh!

Zoxc commented Jan 29, 2020

Uh oh!

bors commented Jan 29, 2020

Uh oh!

bors commented Jan 29, 2020

Uh oh!

bors commented Jan 30, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

cjgillot commented Jan 26, 2020 •

edited

Loading

cjgillot Jan 27, 2020 •

edited

Loading