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

uds: illumos can build using existing Solaris support #2563

Merged
merged 1 commit into from
Jul 1, 2020

Conversation

jclulow
Copy link

@jclulow jclulow commented May 27, 2020

First, let me begin by saying I understand that the v0.1 series of tokio is deprecated. Unfortunately it's still seeing somewhat wide usage in the ecosystem, including in RLS in the official Rust toolchain:

$ cargo tree -i -p tokio-uds 
tokio-uds v0.2.6
├── parity-tokio-ipc v0.2.0
│   ├── jsonrpc-client-transports v14.0.5
│   │   └── jsonrpc-core-client v14.0.5
│   │       └── rls-ipc v0.1.0 (/ws/crossrust/work/rust/src/tools/rls/rls-ipc)
│   │           ├── rls v1.41.0 (/ws/crossrust/work/rust/src/tools/rls)
│   │           └── rls-rustc v0.6.0 (/ws/crossrust/work/rust/src/tools/rls/rls-rustc)
│   │               └── rls v1.41.0 (/ws/crossrust/work/rust/src/tools/rls) (*)
│   └── jsonrpc-ipc-server v14.0.3
│       └── rls-ipc v0.1.0 (/ws/crossrust/work/rust/src/tools/rls/rls-ipc) (*)
└── tokio v0.1.22
    ├── jsonrpc-client-transports v14.0.5 (*)
    ├── jsonrpc-server-utils v14.0.5
    │   ├── jsonrpc-client-transports v14.0.5 (*)
    │   └── jsonrpc-ipc-server v14.0.3 (*)
    ├── parity-tokio-ipc v0.2.0 (*)
    ├── rls v1.41.0 (/ws/crossrust/work/rust/src/tools/rls) (*)
    ├── rls-rustc v0.6.0 (/ws/crossrust/work/rust/src/tools/rls/rls-rustc) (*)
    └── tokio-named-pipes v0.1.0
        └── parity-tokio-ipc v0.2.0 (*)
    [dev-dependencies]
    └── rls v1.41.0 (/ws/crossrust/work/rust/src/tools/rls) (*)

I'd like to make this small change to allow us to build RLS on illumos, now that support for our host triple is in the compiler (see rust-lang/rust#71145 and rust-lang/rust#55553) and we're on the path to being in the official CI/CD system (see rust-lang/rust#71272 and rust-lang/compiler-team#279). The existing support in tokio-uds here for Solaris systems is sufficient also for illumos, we just need to fix the conditional compilation directives and get a v0.2.7 of tokio-uds out the door.

I've run the test suite for tokio-uds on a current illumos system and it appears to work.

Thanks!

@Darksonn Darksonn added A-tokio Area: The main tokio crate C-enhancement Category: A PR with an enhancement or bugfix. T-v0.1.x Topic: tokio 0.1.x labels May 27, 2020
@jclulow
Copy link
Author

jclulow commented May 27, 2020

I'm not sure what's up with the FreeBSD CI failure, but it doesn't look related to this change:

pkg install -y curl
Updating FreeBSD repository catalogue...
Fetching meta.txz: . done
pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2
repository FreeBSD has no meta file, using default settings
Fetching packagesite.txz: .......... done
pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2
pkg: Repository FreeBSD load error: meta cannot be loaded No error: 0
Unable to open created repository FreeBSD
Unable to update repository FreeBSD
Error updating repositories!

Exit status: 3

@Darksonn
Copy link
Contributor

I apologize for the delay; we are currently a bit low on manpower. The FreeBSD issue can be fixed by applying the same change as in #2403.

@taiki-e
Copy link
Member

taiki-e commented Jun 11, 2020

Could you merge v0.1.x branch for CI fixes?

@jclulow
Copy link
Author

jclulow commented Jun 14, 2020

@taiki-e Done! I rebased on the CI fix there.

@taiki-e taiki-e added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 19, 2020
@jclulow
Copy link
Author

jclulow commented Jul 1, 2020

Hi! What can I do to help this along? Thanks.

@Darksonn Darksonn merged commit 653007a into tokio-rs:v0.1.x Jul 1, 2020
@jclulow
Copy link
Author

jclulow commented Jul 1, 2020

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-tokio Area: The main tokio crate C-enhancement Category: A PR with an enhancement or bugfix. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-v0.1.x Topic: tokio 0.1.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants