mirror of
https://github.com/jugeeya/UltimateTrainingModpack.git
synced 2024-11-20 00:46:34 +00:00
Update to cargo-skyline 3.0.0 (with updated Rust STD!) (#359)
* Try cargo-skyline 3.0.0 * Update Cargo.toml * Update lib.rs * Update combo.rs
This commit is contained in:
parent
2d37bc22e4
commit
9cc4c6b73b
4 changed files with 4 additions and 5 deletions
2
.github/workflows/rust.yml
vendored
2
.github/workflows/rust.yml
vendored
|
@ -10,7 +10,7 @@ on:
|
|||
jobs:
|
||||
clippy_pr:
|
||||
runs-on: ubuntu-latest
|
||||
container: jugeeya/cargo-skyline:2.1.0-dkp
|
||||
container: jugeeya/cargo-skyline:3.0.0-dkp-beta
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Setup PATH
|
||||
|
|
|
@ -12,7 +12,7 @@ skyline = { git = "https://github.com/ultimate-research/skyline-rs.git" }
|
|||
skyline_smash = { git = "https://github.com/ultimate-research/skyline-smash.git", branch = "no-cache" }
|
||||
skyline-web = { git = "https://github.com/skyline-rs/skyline-web.git" }
|
||||
bitflags = "1.2.1"
|
||||
parking_lot = { version = "0.11.1", features = ["nightly"] }
|
||||
parking_lot = { version = "0.12.0", features = ["nightly"] }
|
||||
lazy_static = "1.4.0"
|
||||
owo-colors = "2.1.0"
|
||||
ramhorns = "0.12.0"
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#![feature(proc_macro_hygiene)]
|
||||
#![feature(with_options)]
|
||||
#![feature(const_mut_refs)]
|
||||
#![feature(exclusive_range_pattern)]
|
||||
#![feature(once_cell)]
|
||||
|
@ -57,7 +56,7 @@ extern "C" {
|
|||
|
||||
macro_rules! c_str {
|
||||
($l:tt) => {
|
||||
[$l.as_bytes(), "\u{0}".as_bytes()].concat().as_ptr();
|
||||
[$l.as_bytes(), "\u{0}".as_bytes()].concat().as_ptr()
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ macro_rules! actionable_statuses {
|
|||
FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ATTACK_AIR,
|
||||
FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_GUARD_ON,
|
||||
FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ESCAPE,
|
||||
];
|
||||
]
|
||||
};
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue