Skip to content

Commit ed73ec0

Browse files
authored
Rollup merge of #58686 - hellow554:rustfmt_depr, r=cramertj
replace deprecated rustfmt_skip with rustfmt::skip
2 parents 4f8ae0a + 6464a0b commit ed73ec0

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/liballoc/boxed.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ impl<T: Clone> Clone for Box<T> {
326326
/// let x = Box::new(5);
327327
/// let y = x.clone();
328328
/// ```
329-
#[rustfmt_skip]
329+
#[rustfmt::skip]
330330
#[inline]
331331
fn clone(&self) -> Box<T> {
332332
box { (**self).clone() }

src/libterm/terminfo/parser/compiled.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use super::super::TermInfo;
99

1010
// These are the orders ncurses uses in its compiled format (as of 5.9). Not sure if portable.
1111

12-
#[rustfmt_skip]
12+
#[rustfmt::skip]
1313
pub static boolfnames: &[&str] = &["auto_left_margin", "auto_right_margin",
1414
"no_esc_ctlc", "ceol_standout_glitch", "eat_newline_glitch", "erase_overstrike", "generic_type",
1515
"hard_copy", "has_meta_key", "has_status_line", "insert_null_glitch", "memory_above",
@@ -22,13 +22,13 @@ pub static boolfnames: &[&str] = &["auto_left_margin", "auto_right_margin",
2222
"no_correctly_working_cr", "gnu_has_meta_key", "linefeed_is_newline", "has_hardware_tabs",
2323
"return_does_clr_eol"];
2424

25-
#[rustfmt_skip]
25+
#[rustfmt::skip]
2626
pub static boolnames: &[&str] = &["bw", "am", "xsb", "xhp", "xenl", "eo",
2727
"gn", "hc", "km", "hs", "in", "db", "da", "mir", "msgr", "os", "eslok", "xt", "hz", "ul", "xon",
2828
"nxon", "mc5i", "chts", "nrrmc", "npc", "ndscr", "ccc", "bce", "hls", "xhpa", "crxm", "daisy",
2929
"xvpa", "sam", "cpix", "lpix", "OTbs", "OTns", "OTnc", "OTMT", "OTNL", "OTpt", "OTxr"];
3030

31-
#[rustfmt_skip]
31+
#[rustfmt::skip]
3232
pub static numfnames: &[&str] = &[ "columns", "init_tabs", "lines",
3333
"lines_of_memory", "magic_cookie_glitch", "padding_baud_rate", "virtual_terminal",
3434
"width_status_line", "num_labels", "label_height", "label_width", "max_attributes",
@@ -39,13 +39,13 @@ pub static numfnames: &[&str] = &[ "columns", "init_tabs", "lines",
3939
"bit_image_entwining", "bit_image_type", "magic_cookie_glitch_ul", "carriage_return_delay",
4040
"new_line_delay", "backspace_delay", "horizontal_tab_delay", "number_of_function_keys"];
4141

42-
#[rustfmt_skip]
42+
#[rustfmt::skip]
4343
pub static numnames: &[&str] = &[ "cols", "it", "lines", "lm", "xmc", "pb",
4444
"vt", "wsl", "nlab", "lh", "lw", "ma", "wnum", "colors", "pairs", "ncv", "bufsz", "spinv",
4545
"spinh", "maddr", "mjump", "mcs", "mls", "npins", "orc", "orl", "orhi", "orvi", "cps", "widcs",
4646
"btns", "bitwin", "bitype", "UTug", "OTdC", "OTdN", "OTdB", "OTdT", "OTkn"];
4747

48-
#[rustfmt_skip]
48+
#[rustfmt::skip]
4949
pub static stringfnames: &[&str] = &[ "back_tab", "bell", "carriage_return",
5050
"change_scroll_region", "clear_all_tabs", "clear_screen", "clr_eol", "clr_eos",
5151
"column_address", "command_character", "cursor_address", "cursor_down", "cursor_home",
@@ -119,7 +119,7 @@ pub static stringfnames: &[&str] = &[ "back_tab", "bell", "carriage_return",
119119
"acs_lrcorner", "acs_ltee", "acs_rtee", "acs_btee", "acs_ttee", "acs_hline", "acs_vline",
120120
"acs_plus", "memory_lock", "memory_unlock", "box_chars_1"];
121121

122-
#[rustfmt_skip]
122+
#[rustfmt::skip]
123123
pub static stringnames: &[&str] = &[ "cbt", "_", "cr", "csr", "tbc", "clear",
124124
"_", "_", "hpa", "cmdch", "cup", "cud1", "home", "civis", "cub1", "mrcup", "cnorm", "cuf1",
125125
"ll", "cuu1", "cvvis", "dch1", "dl1", "dsl", "hd", "smacs", "blink", "bold", "smcup", "smdc",

0 commit comments

Comments
 (0)