diff --git a/src/bin/local.rs b/src/bin/local.rs index 0568e4b0..bf06bd50 100644 --- a/src/bin/local.rs +++ b/src/bin/local.rs @@ -19,29 +19,29 @@ // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -//! This is a binary running in the local environment -//! -//! Before start this program, you have to put a `config.json` under current working -//! Directory, or you have to specify the path to the configuration file. -//! -//! The configuration file is in JSON format. It should at least contains following -//! attributes: -//! -//! ```json -//! { -//! "server": "my_server_ip", -//! "server_port": 8388, -//! "local_address": "127.0.0.1", -//! "local_port": 1080, -//! "password": "mypassword", -//! "timeout": 300, -//! "method": "aes-256-cfb", -//! } -//! ``` -//! - #![feature(phase)] +/// This is a binary running in the local environment +/// +/// Before start this program, you have to put a `config.json` under current working +/// Directory, or you have to specify the path to the configuration file. +/// +/// The configuration file is in JSON format. It should at least contains following +/// attributes: +/// +/// ```json +/// { +/// "server": "my_server_ip", +/// "server_port": 8388, +/// "local_address": "127.0.0.1", +/// "local_port": 1080, +/// "password": "mypassword", +/// "timeout": 300, +/// "method": "aes-256-cfb", +/// } +/// ``` +/// + extern crate getopts; extern crate shadowsocks; #[phase(plugin, link)] diff --git a/src/bin/server.rs b/src/bin/server.rs index 1fed90b9..c916f0e7 100644 --- a/src/bin/server.rs +++ b/src/bin/server.rs @@ -19,29 +19,29 @@ // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -//! This is a binary running in the server environment -//! -//! Before start this program, you have to put a `config.json` under current working -//! Directory, or you have to specify the path to the configuration file. -//! -//! The configuration file is in JSON format. It should at least contains following -//! attributes: -//! -//! ```json -//! { -//! "server": "my_server_ip", -//! "server_port": 8388, -//! "local_address": "127.0.0.1", -//! "local_port": 1080, -//! "password": "mypassword", -//! "timeout": 300, -//! "method": "aes-256-cfb", -//! } -//! ``` -//! - #![feature(phase)] +/// This is a binary running in the server environment +/// +/// Before start this program, you have to put a `config.json` under current working +/// Directory, or you have to specify the path to the configuration file. +/// +/// The configuration file is in JSON format. It should at least contains following +/// attributes: +/// +/// ```json +/// { +/// "server": "my_server_ip", +/// "server_port": 8388, +/// "local_address": "127.0.0.1", +/// "local_port": 1080, +/// "password": "mypassword", +/// "timeout": 300, +/// "method": "aes-256-cfb", +/// } +/// ``` +/// + extern crate getopts; extern crate shadowsocks; #[phase(plugin, link)] diff --git a/src/crypto/cipher.rs b/src/crypto/cipher.rs index a3a6ca55..c84ab461 100644 --- a/src/crypto/cipher.rs +++ b/src/crypto/cipher.rs @@ -19,8 +19,6 @@ // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -//! - use crypto::openssl; pub trait Cipher {