liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Extract Cargo `edition` to `[workspace.package]` 

This is possible since Rust 1.64.0: https://blog.rust-lang.org/2022/09/22/Rust-1.64.0.html#cargo-improvements-workspace-inheritance-and-multi-target-builds
This commit is contained in:
relrelb 2022-10-14 13:09:22 +03:00 committed by relrelb
parent 183b8adbf0
commit 178bf4fe24
20 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -24,6 +24,9 @@ members = [
] ]
resolver = "2" resolver = "2"
[workspace.package]
edition = "2021"
# Don't optimize build scripts and macros. # Don't optimize build scripts and macros.
[profile.release.build-override] [profile.release.build-override]
opt-level = 0 opt-level = 0
@ -49,7 +52,6 @@ opt-level = 3
[profile.dev.package.nihav_duck] [profile.dev.package.nihav_duck]
opt-level = 3 opt-level = 3
# TODO: Set rustflags here instead of in web/core/package.json, when that # TODO: Set rustflags here instead of in web/core/package.json, when that
# feature becomes stable. See: https://github.com/rust-lang/cargo/issues/10271 # feature becomes stable. See: https://github.com/rust-lang/cargo/issues/10271
# Until then, these custom profiles let cargo keep the build cache alive # Until then, these custom profiles let cargo keep the build cache alive

2
core/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "ruffle_core" name = "ruffle_core"
version = "0.1.0" version = "0.1.0"
authors = ["Ruffle LLC <ruffle@ruffle.rs>"] authors = ["Ruffle LLC <ruffle@ruffle.rs>"]
edition = "2021" edition.workspace = true
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
[dependencies] [dependencies]

2
core/build_playerglobal/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "build_playerglobal" name = "build_playerglobal"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition.workspace = true
[dependencies] [dependencies]
convert_case = "0.6.0" convert_case = "0.6.0"

2
core/macros/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "ruffle_macros" name = "ruffle_macros"
version = "0.1.0" version = "0.1.0"
authors = ["Ruffle LLC <ruffle@ruffle.rs>"] authors = ["Ruffle LLC <ruffle@ruffle.rs>"]
edition = "2021" edition.workspace = true
[lib] [lib]
proc-macro = true proc-macro = true

3
desktop/Cargo.toml
View File

@ -2,8 +2,7 @@
name = "ruffle_desktop" name = "ruffle_desktop"
version = "0.1.0" version = "0.1.0"
authors = ["Ruffle LLC <ruffle@ruffle.rs>"] authors = ["Ruffle LLC <ruffle@ruffle.rs>"]
edition = "2021" edition.workspace = true
default-run = "ruffle_desktop"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
[dependencies] [dependencies]

2
exporter/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "exporter" name = "exporter"
version = "0.1.0" version = "0.1.0"
authors = ["Nathan Adams <dinnerbone@dinnerbone.com>"] authors = ["Nathan Adams <dinnerbone@dinnerbone.com>"]
edition = "2021" edition.workspace = true
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
[dependencies] [dependencies]

2
render/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "ruffle_render" name = "ruffle_render"
version = "0.1.0" version = "0.1.0"
authors = ["Ruffle LLC <ruffle@ruffle.rs>"] authors = ["Ruffle LLC <ruffle@ruffle.rs>"]
edition = "2021" edition.workspace = true
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
[dependencies] [dependencies]

2
render/canvas/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "ruffle_render_canvas" name = "ruffle_render_canvas"
version = "0.1.0" version = "0.1.0"
authors = ["Ruffle LLC <ruffle@ruffle.rs>"] authors = ["Ruffle LLC <ruffle@ruffle.rs>"]
edition = "2021" edition.workspace = true
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
[dependencies] [dependencies]

2
render/webgl/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "ruffle_render_webgl" name = "ruffle_render_webgl"
version = "0.1.0" version = "0.1.0"
authors = ["Ruffle LLC <ruffle@ruffle.rs>"] authors = ["Ruffle LLC <ruffle@ruffle.rs>"]
edition = "2021" edition.workspace = true
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
[dependencies] [dependencies]

2
render/wgpu/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "ruffle_render_wgpu" name = "ruffle_render_wgpu"
version = "0.1.0" version = "0.1.0"
authors = ["Nathan Adams <dinnerbone@dinnerbone.com>"] authors = ["Nathan Adams <dinnerbone@dinnerbone.com>"]
edition = "2021" edition.workspace = true
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
[dependencies] [dependencies]

2
scanner/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "ruffle_scanner" name = "ruffle_scanner"
version = "0.1.0" version = "0.1.0"
authors = ["Nathan Adams <dinnerbone@dinnerbone.com>"] authors = ["Nathan Adams <dinnerbone@dinnerbone.com>"]
edition = "2021" edition.workspace = true
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
[dependencies] [dependencies]

2
swf/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "swf" name = "swf"
version = "0.2.0" version = "0.2.0"
edition = "2021" edition.workspace = true
authors = ["Ruffle LLC <ruffle@ruffle.rs>"] authors = ["Ruffle LLC <ruffle@ruffle.rs>"]
repository = "https://github.com/ruffle-rs/ruffle" repository = "https://github.com/ruffle-rs/ruffle"
homepage = "https://github.com/ruffle-rs/ruffle" homepage = "https://github.com/ruffle-rs/ruffle"

2
tests/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "tests" name = "tests"
version = "0.1.0" version = "0.1.0"
authors = ["Aaron Hill <aa1ronham@gmail.com>"] authors = ["Aaron Hill <aa1ronham@gmail.com>"]
edition = "2021" edition.workspace = true
[dependencies] [dependencies]
futures = "0.3.24" futures = "0.3.24"

4
tests/input-format/Cargo.toml
View File

@ -1,9 +1,7 @@
[package] [package]
name = "ruffle_input_format" name = "ruffle_input_format"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
serde = { version = "1.0.145", features = ["derive"] } serde = { version = "1.0.145", features = ["derive"] }

2
video/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "ruffle_video" name = "ruffle_video"
version = "0.1.0" version = "0.1.0"
authors = ["Ruffle LLC <ruffle@ruffle.rs>"] authors = ["Ruffle LLC <ruffle@ruffle.rs>"]
edition = "2021" edition.workspace = true
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
[dependencies] [dependencies]

2
video/software/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "ruffle_video_software" name = "ruffle_video_software"
version = "0.1.0" version = "0.1.0"
authors = ["Ruffle LLC <ruffle@ruffle.rs>"] authors = ["Ruffle LLC <ruffle@ruffle.rs>"]
edition = "2021" edition.workspace = true
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
[dependencies] [dependencies]

2
web/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "ruffle_web" name = "ruffle_web"
version = "0.1.0" version = "0.1.0"
authors = ["Mike Welsh <mwelsh@gmail.com>"] authors = ["Mike Welsh <mwelsh@gmail.com>"]
edition = "2021" edition.workspace = true
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
description = "Web (WASM) bindings to the Ruffle flash player" description = "Web (WASM) bindings to the Ruffle flash player"
readme = "README.md" readme = "README.md"

2
web/common/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "ruffle_web_common" name = "ruffle_web_common"
version = "0.1.0" version = "0.1.0"
authors = ["Ruffle LLC <ruffle@ruffle.rs>"] authors = ["Ruffle LLC <ruffle@ruffle.rs>"]
edition = "2021" edition.workspace = true
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
[dependencies] [dependencies]

2
web/packages/extension/safari/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "ruffle_web_safari" name = "ruffle_web_safari"
version = "0.1.0" version = "0.1.0"
authors = ["Mike Welsh <mwelsh@gmail.com>"] authors = ["Mike Welsh <mwelsh@gmail.com>"]
edition = "2021" edition.workspace = true
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
description = "Native binary for the Safari Web Extension" description = "Native binary for the Safari Web Extension"
readme = "README.md" readme = "README.md"

2
wstr/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "ruffle_wstr" name = "ruffle_wstr"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition.workspace = true
authors = ["Arthur Heuillard <arthur.heuillard<orange.fr>"] authors = ["Arthur Heuillard <arthur.heuillard<orange.fr>"]
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"