Skip to content

Commit

Permalink
Rollup merge of #70824 - yoshuawuyts:fix-labels-in-std-macro-imports,…
Browse files Browse the repository at this point in the history
… r=Mark-Simulacrum

Remove marker comments in libstd/lib.rs macro imports

These comments were probably moved around when rustfmt was introduced. They don't correctly denote what they were intended for, so I propose we remove them instead. Thanks!
  • Loading branch information
Centril committed Apr 5, 2020
2 parents 534f8da + 004ce25 commit 23acf87
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions src/libstd/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -517,20 +517,8 @@ pub use std_detect::detect;
#[stable(feature = "rust1", since = "1.0.0")]
#[allow(deprecated, deprecated_in_future)]
pub use core::{
// Stable
assert_eq,
assert_ne,
debug_assert,
debug_assert_eq,
debug_assert_ne,
// Unstable
matches,
r#try,
todo,
unimplemented,
unreachable,
write,
writeln,
assert_eq, assert_ne, debug_assert, debug_assert_eq, debug_assert_ne, matches, r#try, todo,
unimplemented, unreachable, write, writeln,
};

// Re-export built-in macros defined through libcore.
Expand Down

0 comments on commit 23acf87

Please sign in to comment.