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

Fix new clippy lints for rustc 1.75 #3318

Merged
merged 2 commits into from
Dec 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bin/common.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017-2022, The rav1e contributors. All rights reserved
// Copyright (c) 2017-2023, The rav1e contributors. All rights reserved
//
// This source code is subject to the terms of the BSD 2 Clause License and
// the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
Expand Down
2 changes: 1 addition & 1 deletion src/bin/rav1e-ch.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017-2022, The rav1e contributors. All rights reserved
// Copyright (c) 2017-2023, The rav1e contributors. All rights reserved
//
// This source code is subject to the terms of the BSD 2 Clause License and
// the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
Expand Down
2 changes: 1 addition & 1 deletion src/bin/rav1e.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017-2022, The rav1e contributors. All rights reserved
// Copyright (c) 2017-2023, The rav1e contributors. All rights reserved
//
// This source code is subject to the terms of the BSD 2 Clause License and
// the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
Expand Down
2 changes: 1 addition & 1 deletion src/capi.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2001-2016, Alliance for Open Media. All rights reserved
// Copyright (c) 2017-2022, The rav1e contributors. All rights reserved
// Copyright (c) 2017-2023, The rav1e contributors. All rights reserved
//
// This source code is subject to the terms of the BSD 2 Clause License and
// the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
Expand Down
3 changes: 1 addition & 2 deletions src/context/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017-2022, The rav1e contributors. All rights reserved
// Copyright (c) 2017-2023, The rav1e contributors. All rights reserved
//
// This source code is subject to the terms of the BSD 2 Clause License and
// the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
Expand Down Expand Up @@ -70,7 +70,6 @@ mod block_unit;
pub use block_unit::*;

mod frame_header;
pub use frame_header::*;

#[derive(Debug, Default)]
pub struct FieldMap {
Expand Down
22 changes: 11 additions & 11 deletions src/encoder.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2018-2022, The rav1e contributors. All rights reserved
// Copyright (c) 2018-2023, The rav1e contributors. All rights reserved
//
// This source code is subject to the terms of the BSD 2 Clause License and
// the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
Expand Down Expand Up @@ -2990,16 +2990,16 @@ fn encode_partition_topdown<T: Pixel, W: Writer>(
match partition {
PartitionType::PARTITION_NONE => {
let rdo_decision;
let part_decision = if let Some(part_mode) = rdo_output.part_modes.get(0)
{
// The optimal prediction mode is known from a previous iteration
part_mode
} else {
// Make a prediction mode decision for blocks encoded with no rdo_partition_decision call (e.g. edges)
rdo_decision =
rdo_mode_decision(fi, ts, cw, bsize, tile_bo, inter_cfg);
&rdo_decision
};
let part_decision =
if let Some(part_mode) = rdo_output.part_modes.first() {
// The optimal prediction mode is known from a previous iteration
part_mode
} else {
// Make a prediction mode decision for blocks encoded with no rdo_partition_decision call (e.g. edges)
rdo_decision =
rdo_mode_decision(fi, ts, cw, bsize, tile_bo, inter_cfg);
&rdo_decision
};

let mut mode_luma = part_decision.pred_mode_luma;
let mut mode_chroma = part_decision.pred_mode_chroma;
Expand Down