Skip to content

Don't include flock support on Solaris - #3310

Closed
inferiorhumanorgans wants to merge 2 commits into
rust-lang:mainfrom
inferiorhumanorgans:solaris-no-flock
Closed

Don't include flock support on Solaris#3310
inferiorhumanorgans wants to merge 2 commits into
rust-lang:mainfrom
inferiorhumanorgans:solaris-no-flock

Conversation

@inferiorhumanorgans

Copy link
Copy Markdown
Contributor

This should disable the flock wrapper and related consts on Solaris, but leave them in place for OpenSolaris derivatives like Illumos which do have a BSD-esque flock.

@rustbot

rustbot commented Jul 30, 2023

Copy link
Copy Markdown
Collaborator

r? @JohnTitor

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

@rustbot

rustbot commented Jul 30, 2023

Copy link
Copy Markdown
Collaborator

Some changes occurred in solarish module

cc @jclulow, @pfmooney

Disable the flock wrapper and related consts on Solaris, but leave
them in place for OpenSolaris derivatives like Illumos which do have
a BSD-esque flock.
Comment thread src/unix/solarish/mod.rs Outdated
Comment thread src/unix/mod.rs
@JohnTitor

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Aug 20, 2023

Copy link
Copy Markdown
Contributor

📌 Commit 076f240 has been approved by JohnTitor

It is now in the queue for this repository.

@bors

bors commented Aug 20, 2023

Copy link
Copy Markdown
Contributor

⌛ Testing commit 076f240 with merge 65b16b3...

bors added a commit that referenced this pull request Aug 20, 2023
Don't include flock support on Solaris

This should disable the flock wrapper and related consts on Solaris, but leave them in place for OpenSolaris derivatives like Illumos which do have a BSD-esque flock.
@bors

bors commented Aug 20, 2023

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-cirrus-freebsd-13

@inferiorhumanorgans

Copy link
Copy Markdown
Contributor Author
  error: macros cannot expand to foreign items
      --> ../src/unix/mod.rs:1070:5
       |
  1070 | /     cfg_if! {
  1071 | |         if #[cfg(not(target_os = "solaris"))] {
  1072 | |             pub fn flock(fd: ::c_int, operation: ::c_int) -> ::c_int;
  1073 | |         }
  1074 | |     }
       | |_____^

So is the answer to pull this out of a cfg_if block?

@JohnTitor

Copy link
Copy Markdown
Member

Yeah, that should resolve the error.
@bors r-
@rustbot author

@JohnTitor

Copy link
Copy Markdown
Member

Triage: Closing as inactive, feel free to re-submit a new PR if you're still interested in this change. Thank you anyway!

@JohnTitor JohnTitor closed this Jan 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants