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

[beta] Do not accidentally treat multi-segment meta-items as single-segment #59259

Merged
merged 2 commits into from
Mar 26, 2019

Conversation

petrochenkov
Copy link
Contributor

Partial backport of #58899 to beta

@petrochenkov petrochenkov added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 17, 2019
@rust-highfive
Copy link
Collaborator

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 17, 2019
@pnkfelix
Copy link
Member

pnkfelix commented Mar 21, 2019

Discussed at T-compiler meeting. We are inclined towards a lukewarm beta-accept

Why lukewarm:

  • it would have been nice if some of the extraneous changes were not part of the PR, just to make it more immediately clear on casual review what all the effects of this PR actually are.
  • it is not clear if any of the bugs fixed by this are ultra-high priority.

Having said that, we trust @petrochenkov wouldn't have put the work into making this PR if it wasn't actually important.

However, I also want to make sure this PR gets a proper review to make sure that the changes it makes are the right subset of #58899.

So:

  • I am reassigning it to @estebank for review.
  • Once that review is done, then @petrochenkov can feel free to mark as beta-accepted.

@pnkfelix
Copy link
Member

r? @estebank

@rust-highfive rust-highfive assigned estebank and unassigned eddyb Mar 21, 2019
@petrochenkov
Copy link
Contributor Author

it would have been nice if some of the extraneous changes were not part of the PR

The extraneous changes should be left in #58899, everything here should be necessary due to removal of the old methods.
I've noticed the expand.rs change was mentioned on Zulip, but that's probably the only change that slipped through.

Some(word) => single_imports.push((word.name(), word.span)),
None => ill_formed(nested_meta.span),
match nested_meta.ident() {
Some(ident) if nested_meta.is_word() => single_imports.push(ident),
Copy link
Contributor

Choose a reason for hiding this comment

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

For a follow up PR, I see this pattern in multiple places, it'd be nice to add a method get_word_ident() to nested_meta so you can use if let everywhere the alternative is discarded/an error.

@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Mar 22, 2019

📌 Commit f8b17c5 has been approved by estebank

@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 Mar 22, 2019
@estebank estebank added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Mar 22, 2019
@Centril
Copy link
Contributor

Centril commented Mar 26, 2019

@bors p=1

@bors
Copy link
Contributor

bors commented Mar 26, 2019

⌛ Testing commit f8b17c5 with merge 2df55de6ccdb886fd78e76a80840ee9896816bb1...

@bors
Copy link
Contributor

bors commented Mar 26, 2019

💔 Test failed - checks-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 26, 2019
@rust-highfive
Copy link
Collaborator

The job arm-android of your PR failed on Travis (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.
[01:51:22] test string::test_str_truncate ... ok
[01:51:22] test str::test_unsafe_slice ... ok
[01:51:22] test string::test_str_truncate_invalid_len ... ok
[01:51:22] test string::test_str_truncate_split_codepoint ... ok
[01:51:23] died due to signal 11
[01:51:23] 
[01:51:23] 
[01:51:23] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "arm-linux-androideabi" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "-p" "alloc" "--"
[01:51:23] expected success, got: exit code: 3
---
travis_time:end:00f8a27c:start=1553583100392403140,finish=1553583100403478382,duration=11075242
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0923f6dc
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0287c6e0
travis_time:start:0287c6e0
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:25295c00
$ dmesg | grep -i kill

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
Copy link
Contributor

Centril commented Mar 26, 2019

@bors retry #55861

@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 Mar 26, 2019
@bors
Copy link
Contributor

bors commented Mar 26, 2019

⌛ Testing commit f8b17c5 with merge 88acdb5...

bors added a commit that referenced this pull request Mar 26, 2019
[beta] Do not accidentally treat multi-segment meta-items as single-segment

Partial backport of #58899 to beta
@bors
Copy link
Contributor

bors commented Mar 26, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: estebank
Pushing 88acdb5 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 26, 2019
@bors bors merged commit f8b17c5 into rust-lang:beta Mar 26, 2019
@pietroalbini pietroalbini removed 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 Mar 28, 2019
@petrochenkov petrochenkov deleted the bderval branch June 5, 2019 16:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants