about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-06-03 19:36:32 -0700
committerbors <bors@rust-lang.org>2016-06-03 19:36:32 -0700
commitc81c75076c05990af6f71e56ccc12d7b196ee25c (patch)
treeb53fd41aeba29d33118a57e8363f87915456d009 /src/libstd
parent7de2e6dc828473b60aefe4d2140a602cbeb6d6f9 (diff)
parentf67c4bb6ce12bf7f4c3c843a531be51cdf643c09 (diff)
Auto merge of #33803 - WiSaGaN:feature/rename-main-thread, r=alexcrichton
Rename main thread from "<main>" to "main".

Fix issue #33789

We may need to discuss whether this counts as a breaking change since code may check the main thread name against "\<main\>". Discussion is in #33789
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/rt.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/rt.rs b/src/libstd/rt.rs
index 7217eaa1325..5a7c0fe4816 100644
--- a/src/libstd/rt.rs
+++ b/src/libstd/rt.rs
@@ -48,7 +48,7 @@ fn lang_start(main: *const u8, argc: isize, argv: *const *const u8) -> isize {
         // created. Note that this isn't necessary in general for new threads,
         // but we just do this to name the main thread and to give it correct
         // info about the stack bounds.
-        let thread: Thread = NewThread::new(Some("<main>".to_owned()));
+        let thread: Thread = NewThread::new(Some("main".to_owned()));
         thread_info::set(main_guard, thread);
 
         // Store our args if necessary in a squirreled away location