diff options
author | 2023-02-15 14:55:02 -0800 | |
---|---|---|
committer | 2023-02-15 14:55:02 -0800 | |
commit | 63fb608d8bea8a653bf011f5f9cffc88525576e0 (patch) | |
tree | 938c15b85fd9d27ee3a82806cf83bc211e7b94dd /examples/integration_opengl/src | |
parent | 64e0e817c27d720dc954ee94de58ded35b3f9f9a (diff) | |
parent | 0cb72f69716adc82ad85a0ee7120edb6e653b0c0 (diff) | |
download | iced-63fb608d8bea8a653bf011f5f9cffc88525576e0.tar.gz iced-63fb608d8bea8a653bf011f5f9cffc88525576e0.tar.bz2 iced-63fb608d8bea8a653bf011f5f9cffc88525576e0.zip |
Merge remote-tracking branch 'origin/master' into feat/multi-window-support
# Conflicts:
# native/src/command/action.rs
# native/src/window/action.rs
# winit/src/window.rs
Diffstat (limited to 'examples/integration_opengl/src')
-rw-r--r-- | examples/integration_opengl/src/controls.rs | 2 | ||||
-rw-r--r-- | examples/integration_opengl/src/scene.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/integration_opengl/src/controls.rs b/examples/integration_opengl/src/controls.rs index 076d37d3..22c41066 100644 --- a/examples/integration_opengl/src/controls.rs +++ b/examples/integration_opengl/src/controls.rs @@ -90,7 +90,7 @@ impl Program for Controls { ) .push(sliders) .push( - Text::new(format!("{:?}", background_color)) + Text::new(format!("{background_color:?}")) .size(14) .style(Color::WHITE), ), diff --git a/examples/integration_opengl/src/scene.rs b/examples/integration_opengl/src/scene.rs index fc74b78a..c1d05b65 100644 --- a/examples/integration_opengl/src/scene.rs +++ b/examples/integration_opengl/src/scene.rs @@ -49,7 +49,7 @@ impl Scene { .expect("Cannot create shader"); gl.shader_source( shader, - &format!("{}\n{}", shader_version, shader_source), + &format!("{shader_version}\n{shader_source}"), ); gl.compile_shader(shader); if !gl.get_shader_compile_status(shader) { |