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

Cleanup syntax::ext::build #64670

Merged
merged 4 commits into from
Sep 23, 2019
Merged

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Sep 21, 2019

I suspect most of this code could be inlined but I only removed the bits where the inlining didn't really hurt readability (i.e., method call -> function call) or the completely unused code.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 21, 2019
@rust-highfive
Copy link
Collaborator

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.
2019-09-21T19:58:22.1231347Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-21T19:58:22.1431483Z ##[command]git config gc.auto 0
2019-09-21T19:58:22.1514614Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-21T19:58:22.1572429Z ##[command]git config --get-all http.proxy
2019-09-21T19:58:22.1714853Z ##[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/64670/merge:refs/remotes/pull/64670/merge
---
2019-09-21T20:06:09.8258565Z    Compiling rustc_macros v0.1.0 (/checkout/src/librustc_macros)
2019-09-21T20:06:18.4466068Z     Checking syntax_pos v0.0.0 (/checkout/src/libsyntax_pos)
2019-09-21T20:06:19.8864856Z     Checking rustc_errors v0.0.0 (/checkout/src/librustc_errors)
2019-09-21T20:06:21.1107622Z     Checking fmt_macros v0.0.0 (/checkout/src/libfmt_macros)
2019-09-21T20:06:28.8538686Z error[E0599]: no method named `poly_trait_ref` found for type `&ext::base::ExtCtxt<'a>` in the current scope
2019-09-21T20:06:28.8539056Z    --> src/libsyntax/ext/build.rs:140:39
2019-09-21T20:06:28.8539302Z     |
2019-09-21T20:06:28.8539560Z 140 |         ast::GenericBound::Trait(self.poly_trait_ref(path.span, path),
2019-09-21T20:06:28.8539856Z 
2019-09-21T20:06:29.3176215Z error: aborting due to previous error
2019-09-21T20:06:29.3176325Z 
2019-09-21T20:06:29.3176648Z For more information about this error, try `rustc --explain E0599`.
---
2019-09-21T20:06:29.3800360Z == clock drift check ==
2019-09-21T20:06:29.3811766Z   local time: Sat Sep 21 20:06:29 UTC 2019
2019-09-21T20:06:29.4676673Z   network time: Sat, 21 Sep 2019 20:06:29 GMT
2019-09-21T20:06:29.4676830Z == end clock drift check ==
2019-09-21T20:06:30.6599914Z ##[error]Bash exited with code '1'.
2019-09-21T20:06:30.6632128Z ##[section]Starting: Checkout
2019-09-21T20:06:30.6633603Z ==============================================================================
2019-09-21T20:06:30.6633646Z Task         : Get sources
2019-09-21T20:06:30.6633701Z 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)

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Sep 21, 2019

📌 Commit 8417ac6 has been approved by petrochenkov

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 21, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 22, 2019
… r=petrochenkov

Cleanup syntax::ext::build

I suspect most of this code could be inlined but I only removed the bits where the inlining didn't really hurt readability (i.e., method call -> function call) or the completely unused code.
Centril added a commit to Centril/rust that referenced this pull request Sep 22, 2019
… r=petrochenkov

Cleanup syntax::ext::build

I suspect most of this code could be inlined but I only removed the bits where the inlining didn't really hurt readability (i.e., method call -> function call) or the completely unused code.
bors added a commit that referenced this pull request Sep 23, 2019
Rollup of 7 pull requests

Successful merges:

 - #64294 (Fix `Stdio::piped` example code and lint)
 - #64670 (Cleanup syntax::ext::build)
 - #64674 (Propagate `types.err` in locals further to avoid spurious knock-down errors)
 - #64676 (Parse assoc type bounds in generic params and provide custom diagnostic)
 - #64677 (remove outdated comment)
 - #64679 (Infer consts more consistently)
 - #64688 (Clarify the "since" tidy check)

Failed merges:

r? @ghost
@bors bors merged commit 8417ac6 into rust-lang:master Sep 23, 2019
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.

4 participants