about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2020-04-06 00:53:51 +0200
committerGitHub <noreply@github.com>2020-04-06 00:53:51 +0200
commit23acf87fa0b1f13d88bd44ca44f4e35a46cc456f (patch)
treec0ed3870bb4a69ff85668151be1060c9bbfbce52 /src
parent534f8dadb3d6d006509926c64d54eac2eefae9e5 (diff)
parent004ce25ec0ddb198bb63e14a41aaeb29f7d53bc0 (diff)
downloadrust-23acf87fa0b1f13d88bd44ca44f4e35a46cc456f.tar.gz
rust-23acf87fa0b1f13d88bd44ca44f4e35a46cc456f.zip
Rollup merge of #70824 - yoshuawuyts:fix-labels-in-std-macro-imports, 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!
Diffstat (limited to 'src')
-rw-r--r--src/libstd/lib.rs16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index ff8f6731724..a9a519f0a3a 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -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.