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

Add fspacectl, new in FreeBSD 14 #2543

Merged
merged 1 commit into from
Jan 21, 2022
Merged

Add fspacectl, new in FreeBSD 14 #2543

merged 1 commit into from
Jan 21, 2022

Conversation

asomers
Copy link
Contributor

@asomers asomers commented Nov 17, 2021

No description provided.

@rust-highfive
Copy link

r? @JohnTitor

(rust-highfive has picked a reviewer for you, use r? to override)

@JohnTitor
Copy link
Member

Finally we should prepare FreeBSD 14 CI, let me do that before merging.

@bors
Copy link
Contributor

bors commented Nov 18, 2021

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

@JohnTitor
Copy link
Member

Needs a rebase.

@asomers
Copy link
Contributor Author

asomers commented Nov 28, 2021

Rebased, @JohnTitor .

@asomers asomers force-pushed the fspacectl branch 2 times, most recently from ef7e4be to b777759 Compare November 29, 2021 03:38
self.r_offset == other.r_offset
&& self.r_len == other.r_len
}
}
Copy link
Member

Choose a reason for hiding this comment

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

Can't you just #[derive] these?

Copy link
Member

Choose a reason for hiding this comment

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

Good point, off_t can be derived thus that can be moved inside of s!, I think.

@asomers
Copy link
Contributor Author

asomers commented Jan 21, 2022

I rebased the changes, derived the extra traits, and made spacectl_range's fields public.

@asomers asomers requested review from JohnTitor and Amanieu January 21, 2022 01:50
@Amanieu
Copy link
Member

Amanieu commented Jan 21, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jan 21, 2022

📌 Commit be39286 has been approved by Amanieu

@bors
Copy link
Contributor

bors commented Jan 21, 2022

⌛ Testing commit be39286 with merge b55ad55...

bors added a commit that referenced this pull request Jan 21, 2022
Add fspacectl, new in FreeBSD 14
@bors
Copy link
Contributor

bors commented Jan 21, 2022

💥 Test timed out

@Amanieu
Copy link
Member

Amanieu commented Jan 21, 2022

@bors retry

@bors
Copy link
Contributor

bors commented Jan 21, 2022

⌛ Testing commit be39286 with merge 7600416...

@bors
Copy link
Contributor

bors commented Jan 21, 2022

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: Amanieu
Pushing 7600416 to master...

@bors bors merged commit 7600416 into rust-lang:master Jan 21, 2022
@asomers asomers deleted the fspacectl branch January 22, 2022 06:12
pacak added a commit to pacak/nix that referenced this pull request Feb 7, 2022
rust-lang/libc#2543 was merged and is available
starting from 0.2.114.

Using published version of libc makes it easier to use git version of nix
bors bot added a commit to nix-rust/nix that referenced this pull request Feb 7, 2022
1658: use version of libc published on crates r=rtzoeller a=pacak

rust-lang/libc#2543 was merged and is available
starting from 0.2.114.

Using published version of libc makes it easier to use git version of nix

Co-authored-by: Michael Baikov <manpacket@gmail.com>
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