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

Some more libsyntax::attr cleanup #63272

Merged
merged 3 commits into from
Aug 6, 2019
Merged

Conversation

Mark-Simulacrum
Copy link
Member

Much smaller patch than the last one, mostly just finishing up by removing some Span arguments.

r? @petrochenkov

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

The job x86_64-gnu-llvm-6.0 of your PR failed (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-08-04T23:37:23.5865746Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-04T23:37:23.6043491Z ##[command]git config gc.auto 0
2019-08-04T23:37:23.6122751Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-04T23:37:23.6185490Z ##[command]git config --get-all http.proxy
2019-08-04T23:37:23.6352872Z ##[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/63272/merge:refs/remotes/pull/63272/merge
---
2019-08-04T23:37:58.1268560Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-04T23:37:58.1268747Z 
2019-08-04T23:37:58.1269180Z   git checkout -b <new-branch-name>
2019-08-04T23:37:58.1269363Z 
2019-08-04T23:37:58.1269550Z HEAD is now at cf4bc2e6b Merge d6d782a6e4dd93ba5c0f0c3a7e7b5a15664ffe65 into f01b9f803b59f170f5dabaaa8aedc96abe45bfea
2019-08-04T23:37:58.1443204Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-04T23:37:58.1446569Z ==============================================================================
2019-08-04T23:37:58.1446634Z Task         : Bash
2019-08-04T23:37:58.1446688Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-05T00:40:11.8101843Z .................................................................................................... 1400/8827
2019-08-05T00:40:17.9719415Z .................................................................................................... 1500/8827
2019-08-05T00:40:30.7708635Z ....................................................................i...............i............... 1600/8827
2019-08-05T00:40:38.1795915Z .................................................................................................... 1700/8827
2019-08-05T00:40:53.9923297Z ......................................................iiiii......................................... 1800/8827
2019-08-05T00:41:05.5528512Z .................................................................................................... 2000/8827
2019-08-05T00:41:08.1436293Z .................................................................................................... 2100/8827
2019-08-05T00:41:11.6048093Z .................................................................................................... 2200/8827
2019-08-05T00:41:19.5668341Z .................................................................................................... 2300/8827
---
2019-08-05T00:45:12.6467158Z .................................................................................................... 5200/8827
2019-08-05T00:45:21.0231275Z .....................................................................i.............................. 5300/8827
2019-08-05T00:45:28.5668768Z .................................................................................................... 5400/8827
2019-08-05T00:45:35.7061273Z .................................................................................................... 5500/8827
2019-08-05T00:45:47.1416813Z ...............................................................ii...i..ii...........i............... 5600/8827
2019-08-05T00:46:10.6131825Z .................................................................................................... 5800/8827
2019-08-05T00:46:15.7834048Z .................................................................................................... 5900/8827
2019-08-05T00:46:15.7834048Z .................................................................................................... 5900/8827
2019-08-05T00:46:22.0315889Z ................................................................i..ii............................... 6000/8827
2019-08-05T00:46:51.6150562Z .................................................................................................... 6200/8827
2019-08-05T00:46:53.9088622Z .......i............................................................................................ 6300/8827
2019-08-05T00:46:56.1225129Z ...............................................................................i.................... 6400/8827
2019-08-05T00:46:58.9574656Z .................................................................................................... 6500/8827
---
2019-08-05T00:51:51.7623334Z  finished in 23.194
2019-08-05T00:51:51.7820720Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-05T00:51:52.3957290Z 
2019-08-05T00:51:52.4024418Z running 146 tests
2019-08-05T00:51:55.3931524Z i....iii......iii..iiii....i............................i..i................i....i.........ii.i.i..i 100/146
2019-08-05T00:51:57.2986710Z iii..............i.........iii.i......ii......
2019-08-05T00:51:57.2988064Z 
2019-08-05T00:51:57.2993100Z  finished in 5.517
2019-08-05T00:51:57.3221427Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-05T00:51:57.4889593Z 
---
2019-08-05T00:52:00.3982162Z  finished in 2.309
2019-08-05T00:52:00.3982645Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-05T00:52:00.3982839Z 
2019-08-05T00:52:00.3982974Z running 9 tests
2019-08-05T00:52:00.3983608Z iiiiiiiii
2019-08-05T00:52:00.3984453Z 
2019-08-05T00:52:00.3984589Z  finished in 0.159
2019-08-05T00:52:00.3985320Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-05T00:52:00.3985537Z 
---
2019-08-05T00:52:18.6378722Z  finished in 18.809
2019-08-05T00:52:18.6579046Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-05T00:52:18.8229766Z 
2019-08-05T00:52:18.8231103Z running 122 tests
2019-08-05T00:52:43.9295074Z .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....i..........iiii..........i...ii...i.......ii.i 100/122
2019-08-05T00:52:48.8127324Z .i.i......iii.i.....ii
2019-08-05T00:52:48.8130679Z 
2019-08-05T00:52:48.8131026Z  finished in 30.155
2019-08-05T00:52:48.8139145Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-05T00:52:48.8140881Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-08-05T01:07:24.2126133Z 
2019-08-05T01:07:24.2129051Z    Doc-tests core
2019-08-05T01:07:28.5757286Z 
2019-08-05T01:07:28.5780429Z running 2379 tests
2019-08-05T01:07:41.3198322Z ......iiiii......................................................................................... 100/2379
2019-08-05T01:07:53.8360321Z .........................................................................ii......................... 200/2379
2019-08-05T01:08:24.2925420Z .................................................................................................... 400/2379
2019-08-05T01:08:24.2925420Z .................................................................................................... 400/2379
2019-08-05T01:08:35.9928474Z ..............................i..i.................iiii............................................. 500/2379
2019-08-05T01:08:59.7446892Z .................................................................................................... 700/2379
2019-08-05T01:09:11.7919225Z .................................................................................................... 800/2379
2019-08-05T01:09:23.8623140Z .................................................................................................... 900/2379
2019-08-05T01:09:36.3713132Z .................................................................................................... 1000/2379
---
2019-08-05T01:14:59.0523856Z 
2019-08-05T01:14:59.0524069Z running 989 tests
2019-08-05T01:15:23.5159526Z i................................................................................................... 100/989
2019-08-05T01:15:37.0319095Z .................................................................................................... 200/989
2019-08-05T01:15:46.2127420Z .................iii......i......i...i......i....................................................... 300/989
2019-08-05T01:15:51.2703758Z .................................................................................................... 400/989
2019-08-05T01:15:59.6756406Z ................................i..i.................................ii............................. 500/989
2019-08-05T01:16:14.9778857Z .................................................................................................... 700/989
2019-08-05T01:16:14.9778857Z .................................................................................................... 700/989
2019-08-05T01:16:23.7045558Z ...............iiii................................................................................. 800/989
2019-08-05T01:16:38.5377783Z .................................................................................................... 900/989
2019-08-05T01:16:46.2888903Z .....................................iiii................................................
2019-08-05T01:16:46.2890115Z 
2019-08-05T01:16:46.3081331Z  finished in 248.869
2019-08-05T01:16:46.3099781Z Testing unwind stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-05T01:16:46.5052884Z     Finished release [optimized] target(s) in 0.19s
---
2019-08-05T01:21:23.6990235Z    Compiling parking_lot_core v0.4.0
2019-08-05T01:21:37.3551976Z    Compiling tempfile v3.0.5
2019-08-05T01:21:39.1807753Z    Compiling parking_lot v0.7.1
2019-08-05T01:21:40.1774836Z    Compiling rustdoc v0.0.0 (/checkout/src/librustdoc)
2019-08-05T01:21:42.4023045Z error[E0061]: this function takes 3 parameters but 4 parameters were supplied
2019-08-05T01:21:42.4030578Z    --> src/librustdoc/clean/cfg/tests.rs:213:18
2019-08-05T01:21:42.4031351Z     |
2019-08-05T01:21:42.4031703Z 213 |           let mi = attr::mk_name_value_item(
2019-08-05T01:21:42.4032306Z 214 | |             DUMMY_SP,
2019-08-05T01:21:42.4032622Z 215 | |             Ident::from_str("foo"),
2019-08-05T01:21:42.4032927Z 216 | |             LitKind::Bool(false),
2019-08-05T01:21:42.4033244Z 217 | |             DUMMY_SP,
---
2019-08-05T01:21:44.6162187Z warning: build failed, waiting for other jobs to finish...
2019-08-05T01:23:58.1695133Z error: build failed
2019-08-05T01:23:58.1720225Z 
2019-08-05T01:23:58.1720790Z 
2019-08-05T01:23:58.1721567Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "2" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/rustdoc/Cargo.toml" "-p" "rustdoc:0.0.0" "--" "--quiet"
2019-08-05T01:23:58.1721734Z 
2019-08-05T01:23:58.1721760Z 
2019-08-05T01:23:58.1740032Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-08-05T01:23:58.1740185Z Build completed unsuccessfully in 1:39:43
2019-08-05T01:23:58.1740185Z Build completed unsuccessfully in 1:39:43
2019-08-05T01:23:59.6135537Z ##[error]Bash exited with code '1'.
2019-08-05T01:23:59.6181881Z ##[section]Starting: Checkout
2019-08-05T01:23:59.6183543Z ==============================================================================
2019-08-05T01:23:59.6183595Z Task         : Get sources
2019-08-05T01:23:59.6183658Z 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)

@@ -347,16 +347,17 @@ impl Attribute {

pub fn mk_name_value_item_str(ident: Ident, value: Spanned<Symbol>) -> MetaItem {
let lit_kind = LitKind::Str(value.node, ast::StrStyle::Cooked);
mk_name_value_item(ident.span.to(value.span), ident, lit_kind, value.span)
let pos = ident.span.to(value.span);
mk_name_value_item(ident.with_span_pos(pos), lit_kind, value.span)
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd rather move the span concatenation logic into mk_name_value_item and avoid changing the ident span.

@petrochenkov
Copy link
Contributor

r=me with the comment addressed and rustdoc fixed

@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 Aug 5, 2019
@Mark-Simulacrum
Copy link
Member Author

@bors r=petrochenkov rollup

@bors
Copy link
Contributor

bors commented Aug 5, 2019

📌 Commit 8849149 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 5, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 5, 2019
…chenkov

Some more libsyntax::attr cleanup

Much smaller patch than the last one, mostly just finishing up by removing some Span arguments.

r? @petrochenkov
Centril added a commit to Centril/rust that referenced this pull request Aug 6, 2019
…chenkov

Some more libsyntax::attr cleanup

Much smaller patch than the last one, mostly just finishing up by removing some Span arguments.

r? @petrochenkov
Centril added a commit to Centril/rust that referenced this pull request Aug 6, 2019
…chenkov

Some more libsyntax::attr cleanup

Much smaller patch than the last one, mostly just finishing up by removing some Span arguments.

r? @petrochenkov
Centril added a commit to Centril/rust that referenced this pull request Aug 6, 2019
…chenkov

Some more libsyntax::attr cleanup

Much smaller patch than the last one, mostly just finishing up by removing some Span arguments.

r? @petrochenkov
bors added a commit that referenced this pull request Aug 6, 2019
Rollup of 14 pull requests

Successful merges:

 - #61457 (Implement DoubleEndedIterator for iter::{StepBy, Peekable, Take})
 - #63017 (Remove special code-path for handing unknown tokens)
 - #63184 (Explaining the reason why validation is performed in to_str of path.rs)
 - #63230 (Make use of possibly uninitialized data [E0381] a hard error)
 - #63260 (fix UB in a test)
 - #63264 (Revert "Rollup merge of #62696 - chocol4te:fix_#62194, r=estebank")
 - #63272 (Some more libsyntax::attr cleanup)
 - #63285 (Remove leftover AwaitOrigin)
 - #63287 (Don't store &Span)
 - #63293 (Clarify align_to's requirements and obligations)
 - #63295 (improve align_offset docs)
 - #63299 (Make qualify consts in_projection use PlaceRef)
 - #63312 (doc: fix broken sentence)
 - #63315 (Fix #63313)

Failed merges:

r? @ghost
@bors bors merged commit 8849149 into rust-lang:master Aug 6, 2019
@Mark-Simulacrum Mark-Simulacrum deleted the clean-attr branch August 10, 2019 12:02
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