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

update stdsimd and remove now-unused MaybeUninit::into_inner #58373

Merged
merged 6 commits into from
Feb 18, 2019

Conversation

RalfJung
Copy link
Member

That's a huge diff for stdsimd... Cc @gnzlbg @alexcrichton

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 11, 2019
@RalfJung
Copy link
Member Author

Hm, this fails to build:

error: couldn't read src/libcore/core_arch_docs.md: No such file or directory (os error 2)                                                                                                                       
 --> src/libcore/../stdsimd/crates/core_arch/src/mod.rs:8:17
  |
8 | #[doc(include = "core_arch_docs.md")]
  |                 ^^^^^^^^^^^^^^^^^^^ couldn't read file
  |
  = help: external doc paths are relative to the crate root

@gnzlbg
Copy link
Contributor

gnzlbg commented Feb 11, 2019

cc @QuietMisdreavus it appears that #[doc(include = "core_arch_docs.md")] does not respect #[path].

@RalfJung can you test if creating a symlink from libcore/core_arch_docs.md to stdsimd/crates/core_arch/src/core_arch_docs.md solves this issue?

Also, libstd probably needs to be compiled with --cfg feature="std_detect_file_io" --cfg feature="std_detect_dlsym_getauxval", so those two should probably be added here: https://github.com/rust-lang/rust/blob/master/src/libstd/Cargo.toml#L50

@rust-highfive

This comment has been minimized.

@RalfJung
Copy link
Member Author

RalfJung commented Feb 11, 2019

can you test if creating a symlink from libcore/core_arch_docs.md to stdsimd/crates/core_arch/src/core_arch_docs.md solves this issue?

That seems to help. But don't ask me what it'll do on Windows...

libstd probably needs to be compiled with --cfg feature="std_detect_file_io" --cfg feature="std_detect_dlsym_getauxval", so those two should probably be added

Like this? However, they should probably be documented. If you tell me which text to put there I'll do it. :P

@rust-highfive

This comment has been minimized.

@gnzlbg
Copy link
Contributor

gnzlbg commented Feb 11, 2019

Like this? However, they should probably be documented. If you tell me which text to put there I'll do it. :P

Yes that's exactly what I meant!

I think a comment stating:

# Enable std_detect default features:
# https://github.com/rust-lang-nursery/stdsimd/blob/master/crates/std_detect/Cargo.toml

would be enough.

That seems to help. But don't ask me what it'll do on Windows...

I don't think that will work... Maybe this PR to stdsimd fixes this here: rust-lang/stdarch#680

@RalfJung
Copy link
Member Author

Well let us see.

@bors
Copy link
Contributor

bors commented Feb 12, 2019

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

@RalfJung
Copy link
Member Author

Seems like travis is happy?

I resolved the conflicts.

Copy link
Contributor

@gnzlbg gnzlbg left a comment

Choose a reason for hiding this comment

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

r? @gnzlbg LGTM.

@bors: r+

@RalfJung
Copy link
Member Author

Seems like bors didn't see this, maybe because of the ":"?

@bors r=gnzlbg

@bors
Copy link
Contributor

bors commented Feb 13, 2019

📌 Commit 9d47226ae7be90d2501f13ff12093d6fbd80d4bf has been approved by gnzlbg

@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 Feb 13, 2019
@Centril
Copy link
Contributor

Centril commented Feb 14, 2019

In-between-rollup-filler, @bors p=1

@bors
Copy link
Contributor

bors commented Feb 14, 2019

⌛ Testing commit 9d47226ae7be90d2501f13ff12093d6fbd80d4bf with merge 92e9f3fac3a2bf6ba4ecb146ecbd163639fd94e3...

@RalfJung
Copy link
Member Author

Seems like I somehow lost the part where into_inner gets removed.^^ But that's okay, that part is easy to submit later (and can be rollup'd).

@bors
Copy link
Contributor

bors commented Feb 14, 2019

💔 Test failed - status-appveyor

@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 Feb 14, 2019
@RalfJung
Copy link
Member Author

Log ends in

C:\projects\rust\build\tmp\dist\rust.wxs(144) : warning LGHT1076 : ICE61: This product should remove only older versions of itself. The Maximum version is not less than the current product. (1.34.65535 1.34.0.0)
[TIMING] Extended { stage: 2, host: "i686-pc-windows-gnu", target: "i686-pc-windows-gnu" } -- 1101.683
Build completed successfully in 3:19:57
Command exited with code 259
set PATH=%PATH%;"C:\Program Files (x86)\Windows Kits\10\Debuggers\X64"
if exist %LOCALAPPDATA%\CrashDumps for %%f in (%LOCALAPPDATA%\CrashDumps\*) do cdb -c "k;q" -G -z "%%f"

Is that just a timeout?

@bors
Copy link
Contributor

bors commented Feb 14, 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 14, 2019
@hellow554
Copy link
Contributor

@RalfJung yes, thanks. Sorry that it causes additional headache. 😟

@kennytm kennytm 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 Feb 14, 2019
@gnzlbg
Copy link
Contributor

gnzlbg commented Feb 14, 2019

@RalfJung the problem is that a change in rustc to allow_internal_unstable required a change to stdsimd, which was applied, and appeared to work there, but the update of rust to that version hasnt been done yet, and it apparently fails: I've sent rust-lang/stdarch#687 . This might fix the error, but I'm not sure, am travelling, and can't really test it properly.

@RalfJung
Copy link
Member Author

All right, I updated the submodule to include that commit.

@RalfJung
Copy link
Member Author

@bors r=gnzlbg

@bors
Copy link
Contributor

bors commented Feb 17, 2019

📌 Commit aba0d29 has been approved by gnzlbg

@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 Feb 17, 2019
@Mark-Simulacrum
Copy link
Member

@bors p=10

@bors
Copy link
Contributor

bors commented Feb 18, 2019

⌛ Testing commit aba0d29 with merge d215d95...

bors added a commit that referenced this pull request Feb 18, 2019
update stdsimd and remove now-unused MaybeUninit::into_inner

That's a huge diff for stdsimd... Cc @gnzlbg @alexcrichton
@bors
Copy link
Contributor

bors commented Feb 18, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: gnzlbg
Pushing d215d95 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 18, 2019
@bors bors merged commit aba0d29 into rust-lang:master Feb 18, 2019
@rust-highfive
Copy link
Collaborator

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.
travis_fold:end:services

travis_fold:start:git.checkout
travis_time:start:1383b75c
$ git clone --depth=2 --branch=master https://github.com/rust-lang/rust.git rust-lang/rust
---
  fi
travis_time:end:107a5e32:start=1550468230195332216,finish=1550468230206722480,duration=11390264
travis_fold:end:before_script.3
travis_time:start:04d96fa6
$ MESSAGE_FILE=$(mktemp -t msg.XXXXXX); . src/ci/docker/x86_64-gnu-tools/repo.sh; commit_toolstate_change "$MESSAGE_FILE" "$TRAVIS_BUILD_DIR/src/tools/publish_toolstate.py" "$(git rev-parse HEAD)" "$(git log --format=%s -n1 HEAD)" "$MESSAGE_FILE" "$TOOLSTATE_REPO_ACCESS_TOKEN";
Cloning into 'rust-toolstate'...
I/O error: HTTP Error 422: Unprocessable Entity
📣 Toolstate changed by <unknown PR>!
Tested on commit rust-lang/rust@d215d9591f27d0663445e65615090621153c31df.
Direct link to PR: <<unknown>>
💔 miri on windows: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
💔 miri on linux: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
Traceback (most recent call last):
  File "/home/travis/build/rust-lang/rust/src/tools/publish_toolstate.py", line 219, in <module>
    'Content-Type': 'application/json',
  File "/usr/lib/python2.7/urllib2.py", line 154, in urlopen
    return opener.open(url, data, timeout)
  File "/usr/lib/python2.7/urllib2.py", line 435, in open
    response = meth(req, response)
  File "/usr/lib/python2.7/urllib2.py", line 548, in http_response
    'http', request, response, code, msg, hdrs)
  File "/usr/lib/python2.7/urllib2.py", line 473, in error

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)

@RalfJung
Copy link
Member Author

Uh, what?

$ MESSAGE_FILE=$(mktemp -t msg.XXXXXX); . src/ci/docker/x86_64-gnu-tools/repo.sh; commit_toolstate_change "$MESSAGE_FILE" "$TRAVIS_BUILD_DIR/src/tools/publish_toolstate.py" "$(git rev-parse HEAD)" "$(git log --format=%s -n1 HEAD)" "$MESSAGE_FILE" "$TOOLSTATE_REPO_ACCESS_TOKEN";
Cloning into 'rust-toolstate'...
I/O error: HTTP Error 422: Unprocessable Entity
📣 Toolstate changed by <unknown PR>!
Tested on commit rust-lang/rust@d215d9591f27d0663445e65615090621153c31df.
Direct link to PR: <<unknown>>
💔 miri on windows: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
💔 miri on linux: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
Traceback (most recent call last):
  File "/home/travis/build/rust-lang/rust/src/tools/publish_toolstate.py", line 219, in <module>
    'Content-Type': 'application/json',
  File "/usr/lib/python2.7/urllib2.py", line 154, in urlopen
    return opener.open(url, data, timeout)
  File "/usr/lib/python2.7/urllib2.py", line 435, in open
    response = meth(req, response)
  File "/usr/lib/python2.7/urllib2.py", line 548, in http_response
    'http', request, response, code, msg, hdrs)
  File "/usr/lib/python2.7/urllib2.py", line 473, in error

@rust-lang/infra @oli-obk

@oli-obk
Copy link
Contributor

oli-obk commented Feb 18, 2019

fix is in #58541 (comment)

@RalfJung RalfJung deleted the maybe-uninit branch February 18, 2019 08:27
Centril added a commit to Centril/rust that referenced this pull request Jul 24, 2019
…r=petrochenkov

rustdoc: make #[doc(include)] relative to the containing file

This matches the behavior of other in-source paths like `#[path]` and the `include_X!` macros.

Fixes rust-lang#58373 (comment)
Also addresses rust-lang#44732 (comment)

cc rust-lang#44732

This is still missing a stdsimd change (https://github.com/jonas-schievink/stdsimd/commit/42ed30e0b5fb5e2d11765b5d1e1f36234af85984), so CI will currently fail. I'll land that change once I get initial feedback for this PR.
Centril added a commit to Centril/rust that referenced this pull request Jul 24, 2019
…r=petrochenkov

rustdoc: make #[doc(include)] relative to the containing file

This matches the behavior of other in-source paths like `#[path]` and the `include_X!` macros.

Fixes rust-lang#58373 (comment)
Also addresses rust-lang#44732 (comment)

cc rust-lang#44732

This is still missing a stdsimd change (https://github.com/jonas-schievink/stdsimd/commit/42ed30e0b5fb5e2d11765b5d1e1f36234af85984), so CI will currently fail. I'll land that change once I get initial feedback for this PR.
Centril added a commit to Centril/rust that referenced this pull request Jul 25, 2019
…r=petrochenkov

rustdoc: make #[doc(include)] relative to the containing file

This matches the behavior of other in-source paths like `#[path]` and the `include_X!` macros.

Fixes rust-lang#58373 (comment)
Also addresses rust-lang#44732 (comment)

cc rust-lang#44732

This is still missing a stdsimd change (https://github.com/jonas-schievink/stdsimd/commit/42ed30e0b5fb5e2d11765b5d1e1f36234af85984), so CI will currently fail. I'll land that change once I get initial feedback for this PR.
Centril added a commit to Centril/rust that referenced this pull request Jul 25, 2019
…r=petrochenkov

rustdoc: make #[doc(include)] relative to the containing file

This matches the behavior of other in-source paths like `#[path]` and the `include_X!` macros.

Fixes rust-lang#58373 (comment)
Also addresses rust-lang#44732 (comment)

cc rust-lang#44732

This is still missing a stdsimd change (https://github.com/jonas-schievink/stdsimd/commit/42ed30e0b5fb5e2d11765b5d1e1f36234af85984), so CI will currently fail. I'll land that change once I get initial feedback for this PR.
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants