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

Implement Unsized Rvalues #51131

Merged
merged 10 commits into from
Aug 19, 2018
Merged

Implement Unsized Rvalues #51131

merged 10 commits into from
Aug 19, 2018

Conversation

qnighy
Copy link
Contributor

@qnighy qnighy commented May 28, 2018

This PR is the first step to implement RFC1909: unsized rvalues (#48055).

Implemented

  • Sized is removed for arguments and local bindings. (under #![feature(unsized_locals)])
  • Unsized locations are allowed in MIR
  • Unsized places and operands are correctly translated at codegen

Not implemented in this PR

  • Additional Sized checks:
    • tuple struct constructor (accidentally compiles now)
    • closure arguments at closure generation (accidentally compiles now)
    • upvars (ICEs now)
  • Generating vtable for fn method(self) (ICEs now)
  • VLAs: [e; n] where n isn't const
  • Reduce unnecessary allocations

Current status

  • Fix __rust_probestack (Fix segfault on probestack with dynamic alloca. compiler-builtins#244)
    • Get the fix merged
  • #![feature(unsized_locals)]
    • Give it a tracking issue number
  • Lift sized checks in typeck and MIR-borrowck
    • Forbid A(unsized-expr) will be another PR
  • Minimum working codegen
  • Add more examples and fill in unimplemented codegen paths
  • Loosen object-safety rules (will be another PR)
  • Implement Box<FnOnce> (will be another PR)
  • Reduce temporaries (will be another PR)

@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 Warning 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 May 28, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-3.9 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.
[00:00:00] Submodule 'src/dlmalloc' (https://github.com/alexcrichton/dlmalloc-rs.git) registered for path 'src/dlmalloc'
[00:00:00] Submodule 'src/doc/nomicon' (https://github.com/rust-lang-nursery/nomicon.git) registered for path 'src/doc/nomicon'
[00:00:00] Submodule 'src/doc/reference' (https://github.com/rust-lang-nursery/reference.git) registered for path 'src/doc/reference'
[00:00:00] Submodule 'src/jemalloc' (https://github.com/rust-lang/jemalloc.git) registered for path 'src/jemalloc'
[00:00:00] Submodule 'src/libcompiler_builtins' (https://github.com/qnighy/compiler-builtins) registered for path 'src/libcompiler_builtins'
[00:00:00] Submodule 'src/stdsimd' (https://github.com/rust-lang-nursery/stdsimd) registered for path 'src/stdsimd'
[00:00:00] Submodule 'src/tools/cargo' (https://github.com/rust-lang/cargo.git) registered for path 'src/tools/cargo'
[00:00:00] Submodule 'src/tools/clippy' (https://github.com/rust-lang-nursery/rust-clippy.git) registered for path 'src/tools/clippy'
[00:00:00] Submodule 'src/tools/lld' (https://github.com/rust-lang/lld.git) registered for path 'src/tools/lld'
---
travis_time:start:tidy
tidy check
[00:04:55] * 547 error codes
[00:04:55] * highest error code: E0911
[00:04:55] tidy error: libsyntax/feature_gate.rs:480: no tracking issue for feature unsized_locals
[00:04:56] tidy error: libsyntax/feature_gate.rs:480: no tracking issue for feature unsized_locals
[00:04:56] some tidy checks failed
[00:04:56] 
[00:04:56] 
[00:04:56] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:04:56] 
[00:04:56] 
[00:04:56] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:56] Build completed unsuccessfully in 0:01:46
[00:04:56] Build completed unsuccessfully in 0:01:46
[00:04:56] Makefile:79: recipe for target 'tidy' failed
[00:04:56] make: *** [tidy] Error 1

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0806b926
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

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)

@qnighy qnighy force-pushed the unsized-locals branch 2 times, most recently from f6f4804 to 4dc11f5 Compare May 29, 2018 00:10
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-3.9 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.
[00:45:31] ...............................................i....................................................
[00:45:36] ....................................................................................................
[00:45:39] ....................................................................................................
[00:45:42] ....................................................................................................
[00:45:45] ..........................................................................................F.........
[00:45:55] ....................................................................................................
[00:45:59] ....................................................................................................
[00:46:05] ........................................................................................i...........
[00:46:10] ..................................................................i.................................

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)

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-3.9 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.
[00:44:50] .................................................................i..................................
[00:44:54] ....................................................................................................
[00:45:00] ....................................................................................................
[00:45:06] ..............................................................................................i.....
[00:45:09] ............iiiiiiiii...................................................
[00:45:09] 
[00:45:09] travis_fold:start:test_ui_nll
travis_time:start:test_ui_nll
Check compiletest suite=ui mode=ui compare_mode=nll (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---
[00:45:57] .................................................................i..................................
[00:46:01] ....................................................................................................
[00:46:06] ....................................................................................................
[00:46:12] ..............................................................................................i.....
[00:46:15] ............iiiiiiiii...................................................
[00:46:15] 
[00:46:15]  finished in 65.646
[00:46:15] travis_fold:end:test_ui_nll

---
[01:25:24] test /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md - unsized_locals (line 13) ... FAILED
[01:25:24] 
[01:25:24] failures:
[01:25:24] 
[01:25:24] ---- /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md - unsized_locals (line 73) stdout ----
[01:25:24] error[E0277]: the trait bound `Self: std::marker::Sized` is not satisfied
[01:25:24]  --> /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md:75:12
[01:25:24]   |
[01:25:24] 4 |     fn foo(self) {}
[01:25:24]   |            ^^^^ `Self` does not have a constant size known at compile-time
[01:25:24]   |
[01:25:24]   = help: the trait `std::marker::Sized` is not implemented for `Self`
[01:25:24]   = help: consider adding a `where Self: std::marker::Sized` bound
[01:25:24]   = note: all local variables must have a statically known size
[01:25:24]   = help: unsized locals are gated as an unstable feature
[01:25:24] thread '/checkout/src/doc/unstable-book/src/language-features/unsized-locals.md - unsized_locals (line 73)' panicked at 'couldn't compile the test', librustdoc/test.rs:325:17
[01:25:24] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:25:24] 
[01:25:24] ---- /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md - unsized_locals (line 13) stdout ----
[01:25:24] ---- /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md - unsized_locals (line 13) stdout ----
[01:25:24] error[E0412]: cannot find type `Any` in this scope
[01:25:24]  --> /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md:17:16
[01:25:24]   |
[01:25:24] 5 |     let x: Box<Any> = Box::new(42);
[01:25:24]   |                ^^^ not found in this scope
[01:25:24] help: possible candidate is found in another module, you can import it into scope
[01:25:24] 4 | use std::any::Any;
[01:25:24]   |
[01:25:24] 
[01:25:24] 
[01:25:24] error[E0412]: cannot find type `Any` in this scope
[01:25:24]  --> /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md:18:12
[01:25:24]   |
[01:25:24] 6 |     let x: Any = *x;
[01:25:24]   |            ^^^ not found in this scope
[01:25:24] help: possible candidate is found in another module, you can import it into scope
[01:25:24] 4 | use std::any::Any;
[01:25:24]   |
[01:25:24] 
[01:25:24] 
[01:25:24] error[E0412]: cannot find type `Any` in this scope
[01:25:24]   --> /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md:24:11
[01:25:24]    |
[01:25:24] 12 | fn foo(_: Any) {}
[01:25:24]    |           ^^^ not found in this scope
[01:25:24] help: possible candidate is found in another module, you can import it into scope
[01:25:24] 4  | use std::any::Any;
[01:25:24]    |
[01:25:24] 
[01:25:24] thread '/checkout/src/doc/unstable-book/src/language-features/unsized-locals.md - unsized_locals (line 13)' panicked at 'couldn't compile the test', librustdoc/test.rs:325:17
---
[01:25:24] 
[01:25:24] 
[01:25:24] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:25:24] Build completed unsuccessfully in 0:42:50
[01:25:24] make: *** [check] Error 1
[01:25:24] Makefile:58: recipe for target 'check' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:1c559ae4
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

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)

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-3.9 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.
/usr/local/lib/python2.7/dist-packages/pip/_vendor/requests/packages/urllib3/util/ssl_.py:122: InsecurePlatformWarning: A true SSLContext object is not available. This prevents urllib3 from configuring SSL appropriately and may cause certain SSL connections to fail. You can upgrade to a newer version of Python to solve this. For more information, see https://urllib3.readthedocs.io/en/latest/security.html#insecureplatformwarning.
  InsecurePlatformWarning
/usr/local/lib/python2.7/dist-packages/pip/_vendor/requests/packages/urllib3/util/ssl_.py:122: InsecurePlatformWarning: A true SSLContext object is not available. This prevents urllib3 from configuring SSL appropriately and may cause certain SSL connections to fail. You can upgrade to a newer version of Python to solve this. For more information, see https://urllib3.readthedocs.io/en/latest/security.html#insecureplatformwarning.
  InsecurePlatformWarning
  Downloading https://files.pythonhosted.org/packages/40/7b/dd2e1823627f38afb7e92e4e9792d81902c084ab7501c1f748169a5336ae/awscli-1.15.29-py2.py3-none-any.whl (1.3MB)
    0% |▎                               | 10kB 22.4MB/s eta 0:00:01
    1% |▌                               | 20kB 1.9MB/s eta 0:00:01
    2% |▉                               | 30kB 2.2MB/s eta 0:00:01
    3% |█                               | 40kB 2.0MB/s eta 0:00:01
---
[00:53:45] .................................................................i..................................
[00:53:49] ....................................................................................................
[00:53:55] ....................................................................................................
[00:54:02] ..............................................................................................i.....
[00:54:04] ............iiiiiiiii...................................................
[00:54:04] 
[00:54:04] travis_fold:start:test_ui_nll
travis_time:start:test_ui_nll
Check compiletest suite=ui mode=ui compare_mode=nll (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---
[00:54:53] .................................................................i..................................
[00:54:57] ....................................................................................................
[00:55:02] ....................................................................................................
[00:55:08] ..............................................................................................i.....
[00:55:11] ............iiiiiiiii...................................................
[00:55:11] 
[00:55:11]  finished in 66.297
[00:55:11] travis_fold:end:test_ui_nll

---
[01:35:30] test /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md - unsized_locals (line 13) ... FAILED
[01:35:30] 
[01:35:30] failures:
[01:35:30] 
[01:35:30] ---- /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md - unsized_locals (line 13) stdout ----
[01:35:30] error[E0412]: cannot find type `Any` in this scope
[01:35:30]  --> /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md:17:16
[01:35:30]   |
[01:35:30] 5 |     let x: Box<Any> = Box::new(42);
[01:35:30]   |                ^^^ not found in this scope
[01:35:30] help: possible candidate is found in another module, you can import it into scope
[01:35:30] 4 | use std::any::Any;
[01:35:30]   |
[01:35:30] 
[01:35:30] 
[01:35:30] error[E0412]: cannot find type `Any` in this scope
[01:35:30]  --> /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md:18:12
[01:35:30]   |
[01:35:30] 6 |     let x: Any = *x;
[01:35:30]   |            ^^^ not found in this scope
[01:35:30] help: possible candidate is found in another module, you can import it into scope
[01:35:30] 4 | use std::any::Any;
[01:35:30]   |
[01:35:30] 
[01:35:30] 
[01:35:30] error[E0412]: cannot find type `Any` in this scope
[01:35:30]   --> /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md:24:11
[01:35:30]    |
[01:35:30] 12 | fn foo(_: Any) {}
[01:35:30]    |           ^^^ not found in this scope
[01:35:30] help: possible candidate is found in another module, you can import it into scope
[01:35:30] 4  | use std::any::Any;
[01:35:30]    |
[01:35:30] 
[01:35:30] thread '/checkout/src/doc/unstable-book/src/language-features/unsized-locals.md - unsized_locals (line 13)' panicked at 'couldn't compile the test', librustdoc/test.rs:325:17
---
[01:35:30] 
[01:35:30] 
[01:35:30] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:35:30] Build completed unsuccessfully in 0:44:01
[01:35:30] make: *** [check] Error 1
[01:35:30] Makefile:58: recipe for target 'check' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:042f0a40
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

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)

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-3.9 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.
[00:50:30] .......................................................................i............................
[00:50:35] ....................................................................................................
[00:50:41] ....................................................................................................
[00:50:47] ....................................................................................................
[00:50:51] i.................iiiiiiiii...................................................
[00:50:51] 
[00:50:51] travis_fold:start:test_ui_nll
travis_time:start:test_ui_nll
Check compiletest suite=ui mode=ui compare_mode=nll (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---
[00:51:41] .......................................................................i............................
[00:51:46] ....................................................................................................
[00:51:51] ....................................................................................................
[00:51:57] ....................................................................................................
[00:52:00] i..................iiiiiiiii..................................................
[00:52:00] 
[00:52:00]  finished in 69.392
[00:52:00] travis_fold:end:test_ui_nll

---
[01:35:50] test /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md - unsized_locals (line 13) ... FAILED
[01:35:50] 
[01:35:50] failures:
[01:35:50] 
[01:35:50] ---- /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md - unsized_locals (line 13) stdout ----
[01:35:50] error[E0412]: cannot find type `Any` in this scope
[01:35:50]  --> /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md:17:16
[01:35:50]   |
[01:35:50] 5 |     let x: Box<Any> = Box::new(42);
[01:35:50]   |                ^^^ not found in this scope
[01:35:50] help: possible candidate is found in another module, you can import it into scope
[01:35:50] 4 | use std::any::Any;
[01:35:50]   |
[01:35:50] 
[01:35:50] 
[01:35:50] error[E0412]: cannot find type `Any` in this scope
[01:35:50]  --> /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md:18:12
[01:35:50]   |
[01:35:50] 6 |     let x: Any = *x;
[01:35:50]   |            ^^^ not found in this scope
[01:35:50] help: possible candidate is found in another module, you can import it into scope
[01:35:50] 4 | use std::any::Any;
[01:35:50]   |
[01:35:50] 
[01:35:50] 
[01:35:50] error[E0412]: cannot find type `Any` in this scope
[01:35:50]   --> /checkout/src/doc/unstable-book/src/language-features/unsized-locals.md:24:11
[01:35:50]    |
[01:35:50] 12 | fn foo(_: Any) {}
[01:35:50]    |           ^^^ not found in this scope
[01:35:50] help: possible candidate is found in another module, you can import it into scope
[01:35:50] 4  | use std::any::Any;
[01:35:50]    |
[01:35:50] 
[01:35:50] thread '/checkout/src/doc/unstable-book/src/language-features/unsized-locals.md - unsized_locals (line 13)' panicked at 'couldn't compile the test', librustdoc/test.rs:325:17
---
[01:35:50] 
[01:35:50] 
[01:35:50] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:35:50] Build completed unsuccessfully in 0:47:47
[01:35:50] make: *** [check] Error 1
[01:35:50] Makefile:58: recipe for target 'check' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:004fb200
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

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)

@bors
Copy link
Contributor

bors commented May 31, 2018

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

@qnighy qnighy force-pushed the unsized-locals branch 2 times, most recently from 2c27df5 to 55a1e92 Compare June 2, 2018 10:09
@qnighy qnighy changed the title [WIP] Implement Unsized Rvalues Implement Unsized Rvalues Jun 2, 2018
@qnighy
Copy link
Contributor Author

qnighy commented Jun 2, 2018

I found several missing sizedness checking, namely

  • A(unsized-value) where A is a tuple-struct constructor,
  • Closure arguments when generating closures (they cannot be called because closure variadics are implemented using tuples), and
  • by-move capture of unsized locals.

As adding Sized obligation would very likely break compatibility (they even break core as far as I attempted), I want to check it on HIR after typeck is done. At the same time, I'm considering proposing deny-by-default lint to unsized locals (using the same mechanism), as they aren't for casual use, and it's fallible to write fn foo(s: str) where fn foo(s: &str) is appropriate.

As these plans are going to be large (for me, at least), I want to have this PR merged for now and prepare different PRs.

r? @nikomatsakis

@bors
Copy link
Contributor

bors commented Jun 3, 2018

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

@bors
Copy link
Contributor

bors commented Jun 5, 2018

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

@qnighy
Copy link
Contributor Author

qnighy commented Jun 9, 2018

Trying reassigning to the author of #48055.

r? @aturon

@rust-highfive rust-highfive assigned aturon and unassigned nikomatsakis Jun 9, 2018
@qnighy
Copy link
Contributor Author

qnighy commented Jun 14, 2018

This PR seems to be missed, perhaps because it was initially [WIP]ed?

@pietroalbini
Copy link
Member

Ping from triage @aturon! This PR needs your review.

@aturon
Copy link
Member

aturon commented Jun 22, 2018

cc @rust-lang/compiler I'm not a suitable reviewer for this, can someone take it?

@Mark-Simulacrum
Copy link
Member

Ah, r? @nikomatsakis based on a previous comment

@rust-highfive rust-highfive assigned nikomatsakis and unassigned aturon Jun 22, 2018
@qnighy
Copy link
Contributor Author

qnighy commented Aug 19, 2018

Rebased.

r? @eddyb

@rust-highfive rust-highfive assigned eddyb and unassigned nikomatsakis Aug 19, 2018
@eddyb
Copy link
Member

eddyb commented Aug 19, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Aug 19, 2018

📌 Commit c488d59 has been approved by eddyb

@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 19, 2018
@bors
Copy link
Contributor

bors commented Aug 19, 2018

⌛ Testing commit c488d59 with merge b355906...

bors added a commit that referenced this pull request Aug 19, 2018
Implement Unsized Rvalues

This PR is the first step to implement RFC1909: unsized rvalues (#48055).

## Implemented

- `Sized` is removed for arguments and local bindings. (under `#![feature(unsized_locals)]`)
- Unsized locations are allowed in MIR
- Unsized places and operands are correctly translated at codegen

## Not implemented in this PR

- Additional `Sized` checks:
  - tuple struct constructor (accidentally compiles now)
  - closure arguments at closure generation (accidentally compiles now)
  - upvars (ICEs now)
- Generating vtable for `fn method(self)` (ICEs now)
- VLAs: `[e; n]` where `n` isn't const
- Reduce unnecessary allocations

## Current status

- [x] Fix `__rust_probestack` (rust-lang/compiler-builtins#244)
  - [x] Get the fix merged
- [x] `#![feature(unsized_locals)]`
  - [x] Give it a tracking issue number
- [x] Lift sized checks in typeck and MIR-borrowck
  - [ ] <del>Forbid `A(unsized-expr)`</del> will be another PR
- [x] Minimum working codegen
- [x] Add more examples and fill in unimplemented codegen paths
- [ ] <del>Loosen object-safety rules (will be another PR)</del>
- [ ] <del>Implement `Box<FnOnce>` (will be another PR)</del>
- [ ] <del>Reduce temporaries (will be another PR)</del>
@bors
Copy link
Contributor

bors commented Aug 19, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: eddyb
Pushing b355906 to master...

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. 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.