Skip to content

Add fspacectl, new in FreeBSD 14#2543

Merged
bors merged 1 commit into
rust-lang:masterfrom
asomers:fspacectl
Jan 21, 2022
Merged

Add fspacectl, new in FreeBSD 14#2543
bors merged 1 commit into
rust-lang:masterfrom
asomers:fspacectl

Conversation

@asomers

@asomers asomers commented Nov 17, 2021

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

Copy link
Copy Markdown

r? @JohnTitor

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

@JohnTitor

Copy link
Copy Markdown
Member

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

@bors

bors commented Nov 18, 2021

Copy link
Copy Markdown
Contributor

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

@JohnTitor

Copy link
Copy Markdown
Member

Needs a rebase.

@asomers

asomers commented Nov 28, 2021

Copy link
Copy Markdown
Contributor Author

Rebased, @JohnTitor .

@asomers asomers force-pushed the fspacectl branch 2 times, most recently from ef7e4be to b777759 Compare November 29, 2021 03:38
Comment thread src/unix/bsd/freebsdlike/freebsd/mod.rs Outdated
self.r_offset == other.r_offset
&& self.r_len == other.r_len
}
}

Copy link
Copy Markdown
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
Copy Markdown
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

asomers commented Jan 21, 2022

Copy link
Copy Markdown
Contributor Author

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

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

Amanieu commented Jan 21, 2022

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 21, 2022

Copy link
Copy Markdown
Contributor

📌 Commit be39286 has been approved by Amanieu

@bors

bors commented Jan 21, 2022

Copy link
Copy Markdown
Contributor

⌛ 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

bors commented Jan 21, 2022

Copy link
Copy Markdown
Contributor

💥 Test timed out

@Amanieu

Amanieu commented Jan 21, 2022

Copy link
Copy Markdown
Member

@bors retry

@bors

bors commented Jan 21, 2022

Copy link
Copy Markdown
Contributor

⌛ Testing commit be39286 with merge 7600416...

@bors

bors commented Jan 21, 2022

Copy link
Copy Markdown
Contributor

☀️ 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