Skip to content

Commit

Permalink
Merge #484
Browse files Browse the repository at this point in the history
484: Small fix r=Medowhill a=travis1829

매우 간단한 PR입니다. 바로 merge해주셔도 될 것 같습니다.

* Fix for #480 (comment)
* Fix for #469 (comment)
  * rustfmt version이 1.4.36-nightly로 업데이트되어, 더 이상 `#[rustfmt::skip]`을 붙일 필요가 없습니다.

Co-authored-by: travis1829 <travis1829@naver.com>
  • Loading branch information
kaist-cp-bors[bot] and travis1829 authored Apr 12, 2021
2 parents 3ec08e0 + cc959e2 commit a17a83c
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 4 deletions.
1 change: 0 additions & 1 deletion kernel-rs/src/bio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ impl BufEntry {
}
}

#[rustfmt::skip] // Need this if lower than rustfmt 1.4.34
impl const Default for BufEntry {
fn default() -> Self {
Self::zero()
Expand Down
1 change: 0 additions & 1 deletion kernel-rs/src/file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ impl File {
}
}

#[rustfmt::skip] // Need this if lower than rustfmt 1.4.34
impl const Default for File {
fn default() -> Self {
Self::zero()
Expand Down
1 change: 0 additions & 1 deletion kernel-rs/src/fs/inode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,6 @@ impl InodeGuard<'_> {
}
}

#[rustfmt::skip] // Need this if lower than rustfmt 1.4.34
impl const Default for Inode {
fn default() -> Self {
Self::zero()
Expand Down
2 changes: 1 addition & 1 deletion kernel-rs/src/lock/remotelock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ impl<'s, R: RawLock, U, T> RemoteLock<'s, R, U, T> {
///
/// ```rust,no_run
/// let spinlock: Spinlock<usize> = Spinlock::new("spinlock", 10);
/// let spinlock_remote: RemoteSpinlock<'_, usize, isize> = RemoteLock::new(&spinlock, -20);
/// let spinlock_remote: RemoteLock<'_, RawSpinlock, usize, isize> = RemoteLock::new(&spinlock, -20);
/// ```
pub const fn new(lock: &'s Lock<R, U>, data: T) -> Self {
Self {
Expand Down

0 comments on commit a17a83c

Please sign in to comment.