Auto merge of #78075 - est31:remove_redundant_static, r=jonas-schievink

Remove redundant 'static
This commit is contained in:
bors 2020-10-18 21:02:05 +00:00
commit b1496c6e60
6 changed files with 14 additions and 14 deletions

View File

@ -598,7 +598,7 @@ pub fn is_builtin_attr_name(name: Symbol) -> bool {
BUILTIN_ATTRIBUTE_MAP.get(&name).is_some()
}
pub static BUILTIN_ATTRIBUTE_MAP: SyncLazy<FxHashMap<Symbol, &'static BuiltinAttribute>> =
pub static BUILTIN_ATTRIBUTE_MAP: SyncLazy<FxHashMap<Symbol, &BuiltinAttribute>> =
SyncLazy::new(|| {
let mut map = FxHashMap::default();
for attr in BUILTIN_ATTRIBUTES.iter() {

View File

@ -22,7 +22,7 @@ use std::str;
use tracing::{debug, info};
pub const MACRO_ARGUMENTS: Option<&'static str> = Some("macro arguments");
pub const MACRO_ARGUMENTS: Option<&str> = Some("macro arguments");
#[macro_use]
pub mod parser;

View File

@ -253,9 +253,9 @@ macro_rules! repeat {
};
}
const SHORT: &'static str = "Alice's";
const MEDIUM: &'static str = "Alice's Adventures in Wonderland";
const LONG: &'static str = repeat!(
const SHORT: &str = "Alice's";
const MEDIUM: &str = "Alice's Adventures in Wonderland";
const LONG: &str = repeat!(
r#"
La Guida di Bragia, a Ballad Opera for the Marionette Theatre (around 1850)
Alice's Adventures in Wonderland (1865)

View File

@ -68,7 +68,7 @@ fn bind_udp_socket_bad() {
// returns its own address, it is still an error to bind a UDP socket to
// a non-local address, and so we still get an error here in that case.
const INPUT_23076: &'static str = "1200::AB00:1234::2552:7777:1313:34300";
const INPUT_23076: &str = "1200::AB00:1234::2552:7777:1313:34300";
assert!(crate::net::UdpSocket::bind(INPUT_23076).is_err())
}

View File

@ -1,9 +1,9 @@
pub mod os {
pub const FAMILY: &'static str = "";
pub const OS: &'static str = "";
pub const DLL_PREFIX: &'static str = "";
pub const DLL_SUFFIX: &'static str = ".sgxs";
pub const DLL_EXTENSION: &'static str = "sgxs";
pub const EXE_SUFFIX: &'static str = ".sgxs";
pub const EXE_EXTENSION: &'static str = "sgxs";
pub const FAMILY: &str = "";
pub const OS: &str = "";
pub const DLL_PREFIX: &str = "";
pub const DLL_SUFFIX: &str = ".sgxs";
pub const DLL_EXTENSION: &str = "sgxs";
pub const EXE_SUFFIX: &str = ".sgxs";
pub const EXE_EXTENSION: &str = "sgxs";
}

View File

@ -15,5 +15,5 @@ pub fn parse_prefix(_: &OsStr) -> Option<Prefix<'_>> {
None
}
pub const MAIN_SEP_STR: &'static str = "/";
pub const MAIN_SEP_STR: &str = "/";
pub const MAIN_SEP: char = '/';