Move rustc-guide submodule to rustc-dev-guide #69898

spastorino · 2020-03-10T20:26:12Z

rust-highfive · 2020-03-10T20:26:15Z

⚠️ Warning ⚠️

These commits modify submodules.

pietroalbini · 2020-03-10T20:52:23Z

While the submodule part of this PR is good, extra care should be taken on changing toolstate. There are two requirements on my end for such change:

It shouldn't require opening PRs in the toolstate repository to manually change the data: the toolstate system should be able to detect the new tool doesn't exist yet and add it.
It can't break PR builds of branches created before this is merged: this means the mingw-check builder should pass with the old validation code and the new latest.json.

I'm not deeply familiar with toolstate (cc @kennytm @Mark-Simulacrum), and I need to think a bit more what the best solution for this is. I'll post other comments when I think of something.

spastorino · 2020-03-10T21:07:08Z

We also have this around rust-lang-nursery/rust-toolstate#16. I know that you are aware @pietroalbini, just sharing for the rest :).

rust-highfive · 2020-03-10T22:14:02Z

The job mingw-check 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-03-10T20:26:45.4409534Z ========================== Starting Command Output ===========================
2020-03-10T20:26:45.4411722Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/7e77987c-e8e4-4a9e-a86c-ba5b08c60581.sh
2020-03-10T20:26:45.4412029Z 
2020-03-10T20:26:45.4416584Z ##[section]Finishing: Disable git automatic line ending conversion
2020-03-10T20:26:45.4436840Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/69898/merge to s
2020-03-10T20:26:45.4440198Z Task         : Get sources
2020-03-10T20:26:45.4440434Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-10T20:26:45.4440659Z Version      : 1.0.0
2020-03-10T20:26:45.4440811Z Author       : Microsoft
---
2020-03-10T20:26:46.4515060Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-03-10T20:26:46.4519464Z ##[command]git config gc.auto 0
2020-03-10T20:26:46.4522443Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-03-10T20:26:46.4525169Z ##[command]git config --get-all http.proxy
2020-03-10T20:26:46.4529938Z ##[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/69898/merge:refs/remotes/pull/69898/merge
---
2020-03-10T20:36:11.1094307Z configure: build.locked-deps    := True
2020-03-10T20:36:11.1094553Z configure: llvm.ccache          := sccache
2020-03-10T20:36:11.1094940Z configure: build.cargo-native-static := True
2020-03-10T20:36:11.1095352Z configure: dist.missing-tools   := True
2020-03-10T20:36:11.1095829Z configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
2020-03-10T20:36:11.1096297Z configure: writing `config.toml` in current directory
2020-03-10T20:36:11.1096488Z configure: 
2020-03-10T20:36:11.1096816Z configure: run `python /checkout/x.py --help`
2020-03-10T20:36:11.1097019Z configure: 
---
2020-03-10T20:43:34.4418510Z Build completed successfully in 0:00:41
2020-03-10T20:43:34.4427940Z + /scripts/validate-toolstate.sh
2020-03-10T20:43:34.4462779Z Cloning into 'rust-toolstate'...
2020-03-10T20:43:35.1420522Z Traceback (most recent call last):
2020-03-10T20:43:35.1420885Z   File "../../src/tools/publish_toolstate.py", line 307, in <module>
2020-03-10T20:43:35.1421117Z     cur_datetime
2020-03-10T20:43:35.1421577Z   File "../../src/tools/publish_toolstate.py", line 207, in update_latest
2020-03-10T20:43:35.1422795Z     maintainers = ' '.join('@'+name for name in MAINTAINERS[tool])
2020-03-10T20:43:35.1423385Z KeyError: u'rustc-guide'
2020-03-10T20:43:35.1467619Z   local time: Tue Mar 10 20:43:35 UTC 2020
2020-03-10T20:43:35.3064314Z   network time: Tue, 10 Mar 2020 20:43:35 GMT
2020-03-10T20:43:35.3067104Z == end clock drift check ==
2020-03-10T20:43:36.2357644Z 
2020-03-10T20:43:36.2357644Z 
2020-03-10T20:43:36.2393809Z ##[error]Bash exited with code '1'.
2020-03-10T20:43:36.2407172Z ##[section]Finishing: Run build
2020-03-10T20:43:36.2451274Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/69898/merge to s
2020-03-10T20:43:36.2455957Z Task         : Get sources
2020-03-10T20:43:36.2456253Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-10T20:43:36.2456537Z Version      : 1.0.0
2020-03-10T20:43:36.2456723Z Author       : Microsoft
2020-03-10T20:43:36.2456723Z Author       : Microsoft
2020-03-10T20:43:36.2457023Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-03-10T20:43:36.2457383Z ==============================================================================
2020-03-10T20:43:36.5584247Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-03-10T20:43:36.5628826Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/69898/merge to s
2020-03-10T20:43:36.5722245Z Cleaning up task key
2020-03-10T20:43:36.5723376Z Start cleaning up orphan processes.
2020-03-10T20:43:36.5889650Z Terminate orphan process: pid (4153) (python)
2020-03-10T20:43:36.6038601Z ##[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 @rust-lang/infra. (Feature Requests)

mark-i-m · 2020-03-10T22:58:33Z

It shouldn't require opening PRs in the toolstate repository to manually change the data: the toolstate system should be able to detect the new tool doesn't exist yet and add it.

IIRC, this was not the case when we first added rustc-dev-guide toolstate

mark-i-m · 2020-03-12T20:57:12Z

I think we can fix this now, correct?

mark-i-m · 2020-03-18T23:08:15Z

ping @rust-lang/infra Would be great to fix this soon...

kennytm · 2020-03-23T19:37:25Z

Blocked by proper fix in rust-lang-nursery/rust-toolstate#16.

src/tools/publish_toolstate.py

pietroalbini · 2020-03-23T19:43:27Z

r? @kennytm

crlf0710 · 2020-04-04T17:31:52Z

@rustbot modify labels to -S-blocked +S-waiting-on-author

Now that rust-lang-nursery/rust-toolstate#16 is merged, this is unblocked. Maybe do a rebase to see whether the CI becomes green? @spastorino

Xanewok · 2020-04-04T18:07:47Z

Unfortunately this seems to have broken the entire tree - everything eagerly fails on mingw-check job.

Applying this patch (#70149) still yields:

 Cloning into 'rust-toolstate'...
  File "../../src/tools/publish_toolstate.py", line 208
    if new > old:
                ^
SyntaxError: invalid syntax

src/tools/publish_toolstate.py

Co-Authored-By: Mateusz Mikuła <[email protected]>

Xanewok · 2020-04-04T18:12:17Z

@mati865 nice catch! Let's land this separately.

@bors r+ p=100 (please adjust accordingly if that's not okay, just want to unblock the tree)

bors · 2020-04-04T18:12:19Z

📌 Commit dcf7004 has been approved by Xanewok

bors · 2020-04-04T18:17:22Z

⌛ Testing commit dcf7004 with merge 853c477...

mati865 · 2020-04-04T18:20:31Z

mingw-check is green now.

mark-i-m · 2020-04-04T18:33:32Z

Thanks @mati865 and @Xanewok !

Dylan-DPC-zz · 2020-04-04T18:58:31Z

@bors p=1000
@bors treeclosed=1000

bors · 2020-04-04T21:37:46Z

☀️ Test successful - checks-azure
Approved by: Xanewok
Pushing 853c477 to master...

Xanewok · 2020-04-04T21:39:08Z

@bors treeclosed-

Xanewok · 2020-04-04T21:40:13Z

@Dylan-DPC I guess my power level is too low 😢

Dylan-DPC-zz · 2020-04-04T21:43:43Z

@bors treeclosed-

mati865 · 2020-04-05T07:54:40Z

@Xanewok bors doesn't work with closed PRs. Next time you want to open the tree do it in some open PR 😉

…ulacrum [beta] backports * Use TypeRelating for instantiating query responses rust-lang#69591 * Move rustc-guide submodule to rustc-dev-guide rust-lang#69898

pnkfelix · 2020-04-15T20:17:45Z

removing beta-nominated tag, as this was merged into beta channel as part of PR #70848

rust-highfive assigned pietroalbini Mar 10, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 10, 2020

chrissimpkins mentioned this pull request Mar 11, 2020

rustc-guide to rustc-dev-guide transition rust-lang/rustc-dev-guide#602

Closed

28 tasks

kennytm added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 23, 2020

kennytm reviewed Mar 23, 2020

View reviewed changes

src/tools/publish_toolstate.py Show resolved Hide resolved

rust-highfive assigned kennytm and unassigned pietroalbini Mar 23, 2020

Move rustc-guide submodule to rustc-dev-guide

4387a8b

spastorino force-pushed the rename-rustc-guide2 branch from 71143ae to 4387a8b Compare March 24, 2020 18:39

crlf0710 mentioned this pull request Apr 3, 2020

Add rustc-dev-guide entry rust-lang-nursery/rust-toolstate#16

Merged

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Apr 4, 2020

Xanewok mentioned this pull request Apr 4, 2020

submodules: Update RLS and Rustfmt #70149

Merged

Xanewok mentioned this pull request Apr 4, 2020

Don't import integer and float modules, use assoc consts #70777

Merged

mati865 reviewed Apr 4, 2020

View reviewed changes

src/tools/publish_toolstate.py Outdated Show resolved Hide resolved

Update src/tools/publish_toolstate.py

dcf7004

Co-Authored-By: Mateusz Mikuła <[email protected]>

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 Apr 4, 2020

This was referenced Apr 4, 2020

Add BufRead::read_while #70772

Closed

comment refers to removed type #70783

Merged

Xanewok mentioned this pull request Apr 4, 2020

remove false positives of unused_braces #70789

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 4, 2020

bors merged commit 853c477 into rust-lang:master Apr 4, 2020

Mark-Simulacrum added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Apr 6, 2020

Mark-Simulacrum mentioned this pull request Apr 6, 2020

[beta] backports #70848

Merged

pnkfelix removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 15, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move rustc-guide submodule to rustc-dev-guide #69898

Move rustc-guide submodule to rustc-dev-guide #69898

spastorino commented Mar 10, 2020

rust-highfive commented Mar 10, 2020

pietroalbini commented Mar 10, 2020

spastorino commented Mar 10, 2020

rust-highfive commented Mar 10, 2020

mark-i-m commented Mar 10, 2020

mark-i-m commented Mar 12, 2020

mark-i-m commented Mar 18, 2020

kennytm commented Mar 23, 2020

pietroalbini commented Mar 23, 2020

crlf0710 commented Apr 4, 2020

Xanewok commented Apr 4, 2020

Xanewok commented Apr 4, 2020

bors commented Apr 4, 2020

bors commented Apr 4, 2020

mati865 commented Apr 4, 2020

mark-i-m commented Apr 4, 2020

Dylan-DPC-zz commented Apr 4, 2020

bors commented Apr 4, 2020

Xanewok commented Apr 4, 2020

Xanewok commented Apr 4, 2020

Dylan-DPC-zz commented Apr 4, 2020

mati865 commented Apr 5, 2020

pnkfelix commented Apr 15, 2020

Move rustc-guide submodule to rustc-dev-guide #69898

Move rustc-guide submodule to rustc-dev-guide #69898

Conversation

spastorino commented Mar 10, 2020

rust-highfive commented Mar 10, 2020

pietroalbini commented Mar 10, 2020

spastorino commented Mar 10, 2020

rust-highfive commented Mar 10, 2020

mark-i-m commented Mar 10, 2020

mark-i-m commented Mar 12, 2020

mark-i-m commented Mar 18, 2020

kennytm commented Mar 23, 2020

pietroalbini commented Mar 23, 2020

crlf0710 commented Apr 4, 2020

Xanewok commented Apr 4, 2020

Xanewok commented Apr 4, 2020

bors commented Apr 4, 2020

bors commented Apr 4, 2020

mati865 commented Apr 4, 2020

mark-i-m commented Apr 4, 2020

Dylan-DPC-zz commented Apr 4, 2020

bors commented Apr 4, 2020

Xanewok commented Apr 4, 2020

Xanewok commented Apr 4, 2020

Dylan-DPC-zz commented Apr 4, 2020

mati865 commented Apr 5, 2020

pnkfelix commented Apr 15, 2020