Skip to content

Fix FromStr for new rustc #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexcrichton merged 2 commits into from
Feb 3, 2015
Merged

Fix FromStr for new rustc #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d57b256
Update for new rustc
maurer Feb 2, 2015
63d573c
Fix FromStr and attributes for env_logger
maurer Feb 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions env/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://doc.rust-lang.org/env_logger/")]
#![allow(unstable)]
#![feature(core, os, io)]

extern crate regex;
extern crate log;
Expand Down Expand Up @@ -239,14 +239,14 @@ fn parse_logging_spec(spec: &str) -> (Vec<LogDirective>, Option<Regex>) {
// if the single argument is a log-level string or number,
// treat that as a global fallback
match part0.parse() {
Some(num) => (num, None),
None => (LogLevelFilter::max(), Some(part0)),
Ok(num) => (num, None),
Err(_) => (LogLevelFilter::max(), Some(part0)),
}
}
(Some(part0), Some(""), None) => (LogLevelFilter::max(), Some(part0)),
(Some(part0), Some(part1), None) => {
match part1.parse() {
Some(num) => (num, Some(part0)),
Ok(num) => (num, Some(part0)),
_ => {
println!("warning: invalid logging spec '{}', \
ignoring it", part1);
Expand Down
59 changes: 31 additions & 28 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@
html_root_url = "http://doc.rust-lang.org/log/")]
#![warn(missing_docs)]
#![feature(core, std_misc)]
#![cfg_attr(test, feature(collections))]

use std::ascii::AsciiExt;
use std::cmp;
Expand Down Expand Up @@ -257,13 +256,15 @@ impl Ord for LogLevel {
}

impl FromStr for LogLevel {
fn from_str(level: &str) -> Option<LogLevel> {
type Err = ();
fn from_str(level: &str) -> Result<LogLevel, ()> {
LOG_LEVEL_NAMES.iter()
.position(|&name| name.eq_ignore_ascii_case(level))
.into_iter()
.filter(|&idx| idx != 0)
.map(|idx| LogLevel::from_usize(idx).unwrap())
.next()
.ok_or(())
}
}

Expand Down Expand Up @@ -364,10 +365,12 @@ impl Ord for LogLevelFilter {
}

impl FromStr for LogLevelFilter {
fn from_str(level: &str) -> Option<LogLevelFilter> {
type Err = ();
fn from_str(level: &str) -> Result<LogLevelFilter, ()> {
LOG_LEVEL_NAMES.iter()
.position(|&name| name.eq_ignore_ascii_case(level))
.map(|p| LogLevelFilter::from_usize(p).unwrap())
.ok_or(())
}
}

Expand Down Expand Up @@ -610,19 +613,19 @@ mod tests {
#[test]
fn test_loglevelfilter_from_str() {
let tests = [
("off", Some(LogLevelFilter::Off)),
("error", Some(LogLevelFilter::Error)),
("warn", Some(LogLevelFilter::Warn)),
("info", Some(LogLevelFilter::Info)),
("debug", Some(LogLevelFilter::Debug)),
("trace", Some(LogLevelFilter::Trace)),
("OFF", Some(LogLevelFilter::Off)),
("ERROR", Some(LogLevelFilter::Error)),
("WARN", Some(LogLevelFilter::Warn)),
("INFO", Some(LogLevelFilter::Info)),
("DEBUG", Some(LogLevelFilter::Debug)),
("TRACE", Some(LogLevelFilter::Trace)),
("asdf", None),
("off", Ok(LogLevelFilter::Off)),
("error", Ok(LogLevelFilter::Error)),
("warn", Ok(LogLevelFilter::Warn)),
("info", Ok(LogLevelFilter::Info)),
("debug", Ok(LogLevelFilter::Debug)),
("trace", Ok(LogLevelFilter::Trace)),
("OFF", Ok(LogLevelFilter::Off)),
("ERROR", Ok(LogLevelFilter::Error)),
("WARN", Ok(LogLevelFilter::Warn)),
("INFO", Ok(LogLevelFilter::Info)),
("DEBUG", Ok(LogLevelFilter::Debug)),
("TRACE", Ok(LogLevelFilter::Trace)),
("asdf", Err(())),
];
for &(s, ref expected) in tests.iter() {
assert_eq!(expected, &s.parse());
Expand All @@ -632,18 +635,18 @@ mod tests {
#[test]
fn test_loglevel_from_str() {
let tests = [
("OFF", None),
("error", Some(LogLevel::Error)),
("warn", Some(LogLevel::Warn)),
("info", Some(LogLevel::Info)),
("debug", Some(LogLevel::Debug)),
("trace", Some(LogLevel::Trace)),
("ERROR", Some(LogLevel::Error)),
("WARN", Some(LogLevel::Warn)),
("INFO", Some(LogLevel::Info)),
("DEBUG", Some(LogLevel::Debug)),
("TRACE", Some(LogLevel::Trace)),
("asdf", None),
("OFF", Err(())),
("error", Ok(LogLevel::Error)),
("warn", Ok(LogLevel::Warn)),
("info", Ok(LogLevel::Info)),
("debug", Ok(LogLevel::Debug)),
("trace", Ok(LogLevel::Trace)),
("ERROR", Ok(LogLevel::Error)),
("WARN", Ok(LogLevel::Warn)),
("INFO", Ok(LogLevel::Info)),
("DEBUG", Ok(LogLevel::Debug)),
("TRACE", Ok(LogLevel::Trace)),
("asdf", Err(())),
];
for &(s, ref expected) in tests.iter() {
assert_eq!(expected, &s.parse());
Expand Down