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.

Sign up for GitHub

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

Jump to bottom

update rust edition from 2018 to 2021 #917

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update rust edition from 2018 to 2021 #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ keywords = ["creative", "sketch", "graphics", "audio", "example"]
license = "MIT"
repository = "https://github.com/nannou-org/nannou.git"
homepage = "https://github.com/nannou-org/nannou"
edition = "2018"
edition = "2021"

[dev-dependencies]
async-std = "1.10.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/laser/laser_frame_stream_gui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ fn raw_window_event(_app: &App, model: &mut Model, event: &nannou::winit::event:

fn update(_app: &App, model: &mut Model, update: Update) {
// First, check for new laser DACs.
for dac in model.dac_rx.try_recv() {
while let Ok(dac) = model.dac_rx.try_recv() {
println!("Detected DAC {:?}!", dac.id());
let stream = model
.laser_api
Expand Down
2 changes: 1 addition & 1 deletion generative_design/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ keywords = ["creative", "sketch", "generative", "design", "gestaltung"]
license = "MIT"
repository = "https://github.com/nannou-org/nannou.git"
homepage = "https://github.com/nannou-org/nannou"
edition = "2018"
edition = "2021"

[dev-dependencies]
nannou = { version ="0.18.0", path = "../nannou" }
Expand Down
2 changes: 1 addition & 1 deletion guide/book_tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = 'book_tests'
version = '0.1.0'
authors = ['mitchmindtree <[email protected]>']
edition = '2018'
edition = '2021'
description = 'For testing the nannou-guide, while including the nannou dependencies.'

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion nannou/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ keywords = ["creative", "sketch", "graphics", "audio"]
license = "MIT"
repository = "https://github.com/nannou-org/nannou.git"
homepage = "https://github.com/nannou-org/nannou"
edition = "2018"
edition = "2021"

[dependencies]
async-std = "1.10.0"
Expand Down
2 changes: 1 addition & 1 deletion nannou/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ impl EventLoopWindowTarget {
// This method is solely used during `window::Builder::build` to allow for
pub(crate) fn as_ref(&self) -> &winit::event_loop::EventLoopWindowTarget<()> {
match *self {
EventLoopWindowTarget::Owned(ref event_loop) => (&**event_loop),
EventLoopWindowTarget::Owned(ref event_loop) => &**event_loop,
EventLoopWindowTarget::Pointer(ptr) => {
// This cast is safe, assuming that the `App`'s `EventLoopWindowTarget` will only
// ever be in the `Pointer` state while the pointer is valid - that is, during the
Expand Down
2 changes: 1 addition & 1 deletion nannou_audio/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ keywords = ["audio", "stream", "cross-platform", "dsp", "pcm"]
license = "MIT"
repository = "https://github.com/nannou-org/nannou_audio.git"
homepage = "https://nannou.cc"
edition = "2018"
edition = "2021"

[dependencies]
cpal = "0.13.1"
Expand Down
2 changes: 1 addition & 1 deletion nannou_core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ readme = "README.md"
license = "MIT"
repository = "https://github.com/nannou-org/nannou.git"
homepage = "https://nannou.cc"
edition = "2018"
edition = "2021"

[dependencies]
glam = { version = "0.17", default-features = false, features = ["num-traits", "rand"] }
Expand Down
2 changes: 1 addition & 1 deletion nannou_egui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = [
"Alexandru Ene <[email protected]>",
"mitchmindtree <[email protected]>",
]
edition = "2018"
edition = "2021"
license = "MIT/Apache-2.0"
description = "egui integration for nannou"
repository = "https://github.com/AlexEne/nannou_egui"
Expand Down
2 changes: 1 addition & 1 deletion nannou_egui_demo_app/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "nannou_egui_demo_app"
version = "0.1.0"
authors = ["mitchmindtree <[email protected]>"]
edition = "2018"
edition = "2021"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion nannou_isf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "nannou_isf"
version = "0.1.0"
authors = ["mitchmindtree <[email protected]>"]
edition = "2018"
edition = "2021"

[dependencies]
hotglsl = { git = "https://github.com/nannou-org/hotglsl", branch = "master" }
Expand Down
2 changes: 1 addition & 1 deletion nannou_laser/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "nannou_laser"
version ="0.18.0"
authors = ["mitchmindtree <[email protected]>"]
description = "A cross-platform laser DAC detection and streaming API."
edition = "2018"
edition = "2021"
keywords = ["laser", "dac", "stream", "frame", "ether-dream"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/nannou-org/nannou_laser.git"
Expand Down
2 changes: 1 addition & 1 deletion nannou_mesh/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ readme = "README.md"
license = "MIT"
repository = "https://github.com/nannou-org/nannou.git"
homepage = "https://nannou.cc"
edition = "2018"
edition = "2021"

[dependencies]
nannou_core = { version ="0.18.0", path = "../nannou_core" }
Expand Down
2 changes: 1 addition & 1 deletion nannou_new/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ keywords = ["tool", "build", "nannou", "creative", "sketch"]
license = "MIT"
repository = "https://github.com/nannou-org/nannou.git"
homepage = "https://github.com/nannou-org/nannou/tree/master/nannou_new"
edition = "2018"
edition = "2021"

[dependencies]
cargo = "0.42" # For retrieving the latest `nannou` version and working with cargo-clone.
Expand Down
2 changes: 1 addition & 1 deletion nannou_osc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ keywords = ["OSC", "protocol", "cross-platform", "UDP", "socket"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/nannou-org/nannou_osc.git"
homepage = "https://nannou.cc"
edition = "2018"
edition = "2021"

[dependencies]
rosc = "0.1"
2 changes: 1 addition & 1 deletion nannou_package/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ keywords = ["package", "build", "creative", "sketch"]
license = "MIT"
repository = "https://github.com/nannou-org/nannou.git"
homepage = "https://github.com/nannou-org/nannou"
edition = "2018"
edition = "2021"

[dependencies]
chrono = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion nannou_wgpu/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ readme = "README.md"
license = "MIT"
repository = "https://github.com/nannou-org/nannou.git"
homepage = "https://nannou.cc"
edition = "2018"
edition = "2021"

[dependencies]
async-std = "1.10.0"
Expand Down
2 changes: 1 addition & 1 deletion nature_of_code/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ keywords = ["creative", "sketch", "nature", "code", "processing"]
license = "MIT"
repository = "https://github.com/nannou-org/nannou.git"
homepage = "https://github.com/nannou-org/nannou"
edition = "2018"
edition = "2021"

[dev-dependencies]
nannou = { version ="0.18.0", path = "../nannou" }
Expand Down
2 changes: 1 addition & 1 deletion scripts/set_version/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "set_version"
version = "0.1.0"
authors = ["mitchmindtree <[email protected]>"]
description = "A small tool for setting a new version across all nannou crates."
edition = "2018"
edition = "2021"

[[bin]]
name = "set_version"
Expand Down