Skip to content

Commit 8353db2

Browse files
committed
ci: fix + revert of 1ebc752
1 parent f71aedc commit 8353db2

File tree

5 files changed

+8
-3
lines changed

5 files changed

+8
-3
lines changed

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
strategy:
6666
matrix:
6767
rust:
68-
- stable
68+
- 1.52.1 # MSVR
6969
steps:
7070
- uses: actions/checkout@v2
7171
# Important preparation step: override the latest default Rust version in GitHub CI

multiboot2-header/src/builder/information_request.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ pub struct InformationRequestHeaderTagBuilder {
2121
#[cfg(feature = "builder")]
2222
impl InformationRequestHeaderTagBuilder {
2323
/// New builder.
24-
pub const fn new(flag: HeaderTagFlag) -> Self {
24+
#[allow(clippy::missing_const_for_fn)] // TODO remove once MSRV is higher than 1.52.1
25+
pub fn new(flag: HeaderTagFlag) -> Self {
2526
Self {
2627
irs: BTreeSet::new(),
2728
flag,
@@ -30,6 +31,7 @@ impl InformationRequestHeaderTagBuilder {
3031

3132
/// Returns the expected length of the information request tag,
3233
/// when the `build`-method gets called.
34+
#[allow(clippy::missing_const_for_fn)] // TODO remove once MSRV is higher than 1.52.1
3335
pub fn expected_len(&self) -> usize {
3436
let basic_header_size = size_of::<InformationRequestHeaderTag<0>>();
3537
let req_tags_size = self.irs.len() * size_of::<MbiTagType>();

multiboot2-header/src/header.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ impl<'a> Multiboot2Header<'a> {
4747
assert_eq!(
4848
reference.header_magic(),
4949
MULTIBOOT2_HEADER_MAGIC,
50-
"The Multiboot2 header must contain the MULTIBOOT2_HEADER_MAGIC={MULTIBOOT2_HEADER_MAGIC:x}"
50+
"The Multiboot2 header must contain the MULTIBOOT2_HEADER_MAGIC={:x}",
51+
MULTIBOOT2_HEADER_MAGIC
5152
);
5253
assert!(
5354
reference.verify_checksum(),

multiboot2/src/framebuffer.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ pub enum FramebufferType<'a> {
3939

4040
/// Direct RGB color.
4141
#[allow(missing_docs)]
42+
#[allow(clippy::upper_case_acronyms)]
4243
RGB {
4344
red: FramebufferField,
4445
green: FramebufferField,

multiboot2/src/vbe_info.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ bitflags! {
330330
#[derive(Debug, PartialEq, Eq, Copy, Clone)]
331331
#[repr(u8)]
332332
#[allow(missing_docs)]
333+
#[allow(clippy::upper_case_acronyms)]
333334
pub enum VBEMemoryModel {
334335
Text = 0x00,
335336
CGAGraphics = 0x01,

0 commit comments

Comments
 (0)