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 tests for rust 1.79 #621

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
13 changes: 9 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ jobs:
shell: bash
if: contains(matrix.rust, 'i686')

- name: Enable collapse_debuginfo based on version
run: echo RUSTFLAGS="--cfg dbginfo=\"collapsible\" $RUSTFLAGS" >> $GITHUB_ENV
shell: bash
if: contains(matrix.rust, 'nightly') || contains(matrix.rust, 'beta')

- run: cargo build
- run: cargo test
- run: cargo test --features "serialize-serde"
Expand Down Expand Up @@ -194,7 +199,7 @@ jobs:
with:
submodules: true
- name: Install Rust
run: rustup update stable && rustup default stable
run: rustup update stable --no-self-update && rustup default stable
- run: rustup target add ${{ matrix.target }}
- run: cargo generate-lockfile
- run: echo RUSTFLAGS=-Dwarnings >> $GITHUB_ENV
Expand All @@ -209,7 +214,7 @@ jobs:
with:
submodules: true
- name: Install Rust
run: rustup update stable && rustup default stable && rustup component add rustfmt
run: rustup update stable --no-self-update && rustup default stable && rustup component add rustfmt
- run: cargo fmt --all -- --check

build:
Expand All @@ -228,7 +233,7 @@ jobs:
with:
submodules: true
- name: Install Rust
run: rustup update nightly && rustup default nightly
run: rustup update nightly --no-self-update && rustup default nightly
- run: rustup target add ${{ matrix.target }}
- run: echo RUSTFLAGS=-Dwarnings >> $GITHUB_ENV
shell: bash
Expand All @@ -249,7 +254,7 @@ jobs:
with:
submodules: true
- name: Install Rust
run: rustup update 1.65.0 && rustup default 1.65.0
run: rustup update 1.65.0 --no-self-update && rustup default 1.65.0
- run: cargo build

miri:
Expand Down
5 changes: 5 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ serialize-serde = ["serde"]
# purposes. New code should use none of these features.
coresymbolication = []
dbghelp = []
dl_iterate_phdr = []
dladdr = []
gimli-symbolize = []
kernel32 = []
Expand Down Expand Up @@ -131,3 +132,7 @@ harness = false
name = "current-exe-mismatch"
required-features = ["std"]
harness = false

[lints.rust]
# This crate uses them pervasively
unexpected_cfgs = "allow"
4 changes: 4 additions & 0 deletions crates/as-if-std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,7 @@ cc = "1.0.90"
[features]
default = ['backtrace']
backtrace = ['addr2line', 'miniz_oxide', 'object']
std = []

[lints.rust]
unexpected_cfgs = "allow"
2 changes: 2 additions & 0 deletions tests/accuracy/main.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![cfg(dbginfo = "collapsible")]
mod auxiliary;

macro_rules! pos {
Expand All @@ -6,6 +7,7 @@ macro_rules! pos {
};
}

#[collapse_debuginfo(yes)]
macro_rules! check {
($($pos:expr),*) => ({
verify(&[$($pos,)* pos!()]);
Expand Down
Loading