From b217ad546cd4cf9ac47096ece6c83ef379d05905 Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Wed, 14 Dec 2022 19:20:53 +0100 Subject: [PATCH] Remove backslash-escaping of quotes in raw string In a raw string [no escaping is processed] nor are these quotes treated specially unless it was postfixed with `#`; the backslashes show up in the compiler error displayed to the user instead. For consistency the string this was likely copied from is now also turned into a raw string literal, with backslashes equivalently removed. [no escaping is processed]: https://doc.rust-lang.org/reference/tokens.html#raw-string-literals --- android-activity/src/lib.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/android-activity/src/lib.rs b/android-activity/src/lib.rs index 134444d..594dd59 100644 --- a/android-activity/src/lib.rs +++ b/android-activity/src/lib.rs @@ -72,14 +72,14 @@ compile_error!("android-activity only supports compiling for Android"); #[cfg(all(feature = "game-activity", feature = "native-activity"))] compile_error!( - "The \"game-activity\" and \"native-activity\" features cannot be enabled at the same time" + r#"The "game-activity" and "native-activity" features cannot be enabled at the same time"# ); #[cfg(all( not(any(feature = "game-activity", feature = "native-activity")), not(doc) ))] compile_error!( - r#"Either \"game-activity\" or \"native-activity\" must be enabled as features + r#"Either "game-activity" or "native-activity" must be enabled as features If you have set one of these features then this error indicates that Cargo is trying to link together multiple implementations of android-activity (with incompatible versions) @@ -92,8 +92,7 @@ You can use `cargo tree` (e.g. via `cargo ndk -t arm64-v8a tree`) to identify wh versions have been resolved. You may need to add a `[patch]` into your Cargo.toml to ensure a specific version of -android-activity is used across all of your application's crates. -"# +android-activity is used across all of your application's crates."# ); #[cfg(any(feature = "native-activity", doc))]