---

yaml
---
r: 40310
b: refs/heads/dist-snap
c: 9aadfc3
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: c8b4dea4e0261b1e8c079c1fcf3c61ea9cc15e6e
+refs/heads/dist-snap: 9aadfc3f4b5df00a7f8e9b362385118ae1dba73e
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librusti/rusti.rs

@@ -267,16 +267,18 @@ pub fn main() {
         stmts: ~""
     };
 
-    do rl::complete |line, suggest| {
-        if line.starts_with(":") {
-            suggest(~":clear");
-            suggest(~":exit");
-            suggest(~":help");
+    unsafe {
+        do rl::complete |line, suggest| {
+            if line.starts_with(":") {
+                suggest(~":clear");
+                suggest(~":exit");
+                suggest(~":help");
+            }
         }
     }
 
     while repl.running {
-        let result = rl::read(repl.prompt);
+        let result = unsafe { rl::read(repl.prompt) };
 
         if result.is_none() {
             break;
@@ -290,7 +292,7 @@ pub fn main() {
             loop;
         }
 
-        rl::add_history(line);
+        unsafe { rl::add_history(line) };
 
         if line.starts_with(~":") {
             let full = line.substr(1, line.len() - 1);

branches/dist-snap/src/libstd/rl.rs

@@ -1,3 +1,6 @@
+// FIXME #3921. This is unsafe because linenoise uses global mutable
+// state without mutexes.
+
 use libc::{c_char, c_int};
 
 extern mod rustrt {
@@ -12,33 +15,33 @@ extern mod rustrt {
 }
 
 /// Add a line to history
-pub fn add_history(line: ~str) -> bool {
+pub unsafe fn add_history(line: ~str) -> bool {
     do str::as_c_str(line) |buf| {
         rustrt::linenoiseHistoryAdd(buf) == 1 as c_int
     }
 }
 
 /// Set the maximum amount of lines stored
-pub fn set_history_max_len(len: int) -> bool {
+pub unsafe fn set_history_max_len(len: int) -> bool {
     rustrt::linenoiseHistorySetMaxLen(len as c_int) == 1 as c_int
 }
 
 /// Save line history to a file
-pub fn save_history(file: ~str) -> bool {
+pub unsafe fn save_history(file: ~str) -> bool {
     do str::as_c_str(file) |buf| {
         rustrt::linenoiseHistorySave(buf) == 1 as c_int
     }
 }
 
 /// Load line history from a file
-pub fn load_history(file: ~str) -> bool {
+pub unsafe fn load_history(file: ~str) -> bool {
     do str::as_c_str(file) |buf| {
         rustrt::linenoiseHistoryLoad(buf) == 1 as c_int
     }
 }
 
 /// Print out a prompt and then wait for input and return it
-pub fn read(prompt: ~str) -> Option<~str> {
+pub unsafe fn read(prompt: ~str) -> Option<~str> {
     do str::as_c_str(prompt) |buf| unsafe {
         let line = rustrt::linenoise(buf);
 
@@ -52,7 +55,7 @@ pub type CompletionCb = fn~(~str, fn(~str));
 fn complete_key(_v: @CompletionCb) {}
 
 /// Bind to the main completion callback
-pub fn complete(cb: CompletionCb) unsafe {
+pub unsafe fn complete(cb: CompletionCb) unsafe {
     task::local_data::local_data_set(complete_key, @(move cb));
 
     extern fn callback(line: *c_char, completions: *()) unsafe {