diff --git a/examples/dodge_the_creeps/src/player.rs b/examples/dodge_the_creeps/src/player.rs index 37766afa1..b3a38e879 100644 --- a/examples/dodge_the_creeps/src/player.rs +++ b/examples/dodge_the_creeps/src/player.rs @@ -84,8 +84,8 @@ impl Player { let change = velocity * delta; let position = owner.global_position() + change; let position = Vector2::new( - position.x.clamp(0.0, self.screen_size.x), - position.y.clamp(0.0, self.screen_size.y), + position.x.max(0.0).min(self.screen_size.x), + position.y.max(0.0).min(self.screen_size.y), ); owner.set_global_position(position); } diff --git a/gdnative/tests/ui/from_variant_fail_01.stderr b/gdnative/tests/ui/from_variant_fail_01.stderr index 27b6b6218..815d6bc2e 100644 --- a/gdnative/tests/ui/from_variant_fail_01.stderr +++ b/gdnative/tests/ui/from_variant_fail_01.stderr @@ -1,6 +1,6 @@ error: Missing macro arguments - expecting #[variant(...)]. See documentation: - https://docs.rs/gdnative/0.9.0/gdnative/core_types/trait.ToVariant.html#field-attributes +expecting #[variant(...)]. See documentation: +https://docs.rs/gdnative/0.9.0/gdnative/core_types/trait.ToVariant.html#field-attributes --> $DIR/from_variant_fail_01.rs:5:7 | 5 | #[variant] diff --git a/gdnative/tests/ui/from_variant_fail_02.stderr b/gdnative/tests/ui/from_variant_fail_02.stderr index 7a8757103..471c23e06 100644 --- a/gdnative/tests/ui/from_variant_fail_02.stderr +++ b/gdnative/tests/ui/from_variant_fail_02.stderr @@ -1,7 +1,7 @@ error: Invalid syntax - expecting #[variant(...)]. See documentation: - https://docs.rs/gdnative/0.9.0/gdnative/core_types/trait.ToVariant.html#field-attributes +expecting #[variant(...)]. See documentation: +https://docs.rs/gdnative/0.9.0/gdnative/core_types/trait.ToVariant.html#field-attributes --> $DIR/from_variant_fail_02.rs:6:15 | 6 | #[variant(baz::quux)] - | ^^^ + | ^^^^^^^^^ diff --git a/gdnative/tests/ui/from_variant_fail_03.stderr b/gdnative/tests/ui/from_variant_fail_03.stderr index 6ad0fa3b6..e98d3a61c 100644 --- a/gdnative/tests/ui/from_variant_fail_03.stderr +++ b/gdnative/tests/ui/from_variant_fail_03.stderr @@ -1,6 +1,6 @@ error: Found baz::quux, expected one of: - to_variant_with, from_variant_with, with, skip_to_variant, skip_from_variant, skip +to_variant_with, from_variant_with, with, skip_to_variant, skip_from_variant, skip --> $DIR/from_variant_fail_03.rs:6:15 | 6 | #[variant(baz::quux = "path::to::function")] - | ^^^ + | ^^^^^^^^^ diff --git a/gdnative/tests/ui/from_variant_fail_07.stderr b/gdnative/tests/ui/from_variant_fail_07.stderr index fc4adcd41..f75c8357a 100644 --- a/gdnative/tests/ui/from_variant_fail_07.stderr +++ b/gdnative/tests/ui/from_variant_fail_07.stderr @@ -1,5 +1,5 @@ error: unknown argument, expected one of: - to_variant_with, from_variant_with, with, skip_to_variant, skip_from_variant, skip +to_variant_with, from_variant_with, with, skip_to_variant, skip_from_variant, skip --> $DIR/from_variant_fail_07.rs:5:15 | 5 | #[variant(aoeu = "aoeu")] diff --git a/gdnative/tests/ui/to_variant_fail_01.stderr b/gdnative/tests/ui/to_variant_fail_01.stderr index f7c61a9b4..8c818d723 100644 --- a/gdnative/tests/ui/to_variant_fail_01.stderr +++ b/gdnative/tests/ui/to_variant_fail_01.stderr @@ -1,6 +1,6 @@ error: Missing macro arguments - expecting #[variant(...)]. See documentation: - https://docs.rs/gdnative/0.9.0/gdnative/core_types/trait.ToVariant.html#field-attributes +expecting #[variant(...)]. See documentation: +https://docs.rs/gdnative/0.9.0/gdnative/core_types/trait.ToVariant.html#field-attributes --> $DIR/to_variant_fail_01.rs:5:7 | 5 | #[variant] diff --git a/gdnative/tests/ui/to_variant_fail_02.stderr b/gdnative/tests/ui/to_variant_fail_02.stderr index b2df1e9af..931a230ab 100644 --- a/gdnative/tests/ui/to_variant_fail_02.stderr +++ b/gdnative/tests/ui/to_variant_fail_02.stderr @@ -1,7 +1,7 @@ error: Invalid syntax - expecting #[variant(...)]. See documentation: - https://docs.rs/gdnative/0.9.0/gdnative/core_types/trait.ToVariant.html#field-attributes +expecting #[variant(...)]. See documentation: +https://docs.rs/gdnative/0.9.0/gdnative/core_types/trait.ToVariant.html#field-attributes --> $DIR/to_variant_fail_02.rs:6:15 | 6 | #[variant(baz::quux)] - | ^^^ + | ^^^^^^^^^ diff --git a/gdnative/tests/ui/to_variant_fail_03.stderr b/gdnative/tests/ui/to_variant_fail_03.stderr index f416db5c3..fc2cf3328 100644 --- a/gdnative/tests/ui/to_variant_fail_03.stderr +++ b/gdnative/tests/ui/to_variant_fail_03.stderr @@ -1,6 +1,6 @@ error: Found baz::quux, expected one of: - to_variant_with, from_variant_with, with, skip_to_variant, skip_from_variant, skip +to_variant_with, from_variant_with, with, skip_to_variant, skip_from_variant, skip --> $DIR/to_variant_fail_03.rs:6:15 | 6 | #[variant(baz::quux = "path::to::function")] - | ^^^ + | ^^^^^^^^^ diff --git a/gdnative/tests/ui/to_variant_fail_07.stderr b/gdnative/tests/ui/to_variant_fail_07.stderr index 066f14912..d26655713 100644 --- a/gdnative/tests/ui/to_variant_fail_07.stderr +++ b/gdnative/tests/ui/to_variant_fail_07.stderr @@ -1,5 +1,5 @@ error: unknown argument, expected one of: - to_variant_with, from_variant_with, with, skip_to_variant, skip_from_variant, skip +to_variant_with, from_variant_with, with, skip_to_variant, skip_from_variant, skip --> $DIR/to_variant_fail_07.rs:5:15 | 5 | #[variant(aoeu = "aoeu")]