Rust 2018

Cargo.toml

@@ -7,6 +7,7 @@ categories = ["api-bindings"]
 license = "MIT"
 repository = "https://github.com/sthiele/clingo-rs"
 documentation = "https://docs.rs/clingo"
+edition = "2018"
 
 [dependencies]
 clingo-sys = "0.3.0"

src/ast.rs

@@ -1,4 +1,4 @@
-use ::*;
+use crate::*;
 
 #[derive(Debug, Copy, Clone, PartialEq)]
 pub enum StatementType {

src/examples/ast.rs

@@ -1,7 +1,5 @@
-extern crate clingo;
-
-use std::env;
 use clingo::*;
+use std::env;
 
 pub struct OnStatementData<'a> {
     atom: ast::Atom,

src/examples/backend.rs

@@ -1,7 +1,5 @@
-extern crate clingo;
-
-use std::env;
 use clingo::*;
+use std::env;
 
 fn print_model(model: &Model) {
     // retrieve the symbols in the model

src/examples/configuration.rs

@@ -1,7 +1,5 @@
-extern crate clingo;
-
-use std::env;
 use clingo::*;
+use std::env;
 
 fn print_model(model: &Model) {
     // retrieve the symbols in the model

src/examples/control.rs

@@ -1,7 +1,5 @@
-extern crate clingo;
-
-use std::env;
 use clingo::*;
+use std::env;
 
 fn print_model(model: &Model) {
     // retrieve the symbols in the model

src/examples/inject-terms.rs

@@ -1,7 +1,5 @@
-extern crate clingo;
-
-use std::env;
 use clingo::*;
+use std::env;
 
 fn print_model(model: &Model) {
     // retrieve the symbols in the model

src/examples/model.rs

@@ -1,7 +1,5 @@
-extern crate clingo;
-
-use std::env;
 use clingo::*;
+use std::env;
 
 fn print_model(model: &Model, label: &str, show: &ShowType) {
     print!("{}:", label);

src/examples/propagator.rs

@@ -1,10 +1,8 @@
-extern crate clingo;
-
-use std::env;
-use std::vec::Vec;
+use clingo::*;
 use std::cell::RefCell;
+use std::env;
 use std::rc::Rc;
-use clingo::*;
+use std::vec::Vec;
 
 fn print_model(model: &Model) {
     // retrieve the symbols in the model

src/examples/solve-async.rs

@@ -1,10 +1,7 @@
-extern crate clingo;
-extern crate rand;
-
-use std::env;
+use clingo::*;
 use rand::distributions::{IndependentSample, Range};
+use std::env;
 use std::sync::atomic::{AtomicBool, Ordering};
-use clingo::*;
 
 struct MySEHandler {
     atom: AtomicBool,

src/examples/statistics.rs

@@ -1,7 +1,5 @@
-extern crate clingo;
-
-use std::env;
 use clingo::*;
+use std::env;
 
 fn print_prefix(depth: u8) {
     for _ in 0..depth {

src/examples/symbol.rs

@@ -1,5 +1,3 @@
-extern crate clingo;
-
 use clingo::*;
 use std::collections::hash_map::DefaultHasher;
 use std::hash::{Hash, Hasher};

src/examples/symbolic-atoms.rs

@@ -1,7 +1,5 @@
-extern crate clingo;
-
-use std::env;
 use clingo::*;
+use std::env;
 
 fn main() {
     // collect clingo options from the command line

src/examples/theory-atoms.rs

@@ -1,7 +1,5 @@
-extern crate clingo;
-
-use std::env;
 use clingo::*;
+use std::env;
 
 fn print_model(model: &Model) {
     // retrieve the symbols in the model

src/examples/version.rs

@@ -1,5 +1,3 @@
-extern crate clingo;
-
 fn main() {
     let (mo, mi, re) = clingo::version();
     println!("Hello, this is clingo version {}.{}.{}.", mo, mi, re);

src/lib.rs

@@ -1,25 +1,20 @@
 #![feature(ptr_internals)]
 #![allow(non_upper_case_globals)]
-#[macro_use]
-extern crate bitflags;
-extern crate clingo_sys;
-extern crate failure;
-#[macro_use]
-extern crate failure_derive;
-extern crate libc;
-
-use std::mem;
 use std::ptr::Unique;
-use std::marker::PhantomData;
+use bitflags::bitflags;
+use clingo_sys::*;
+use libc::c_char;
 use std::cmp::Ordering;
-use std::hash::{Hash, Hasher};
 use std::ffi::CStr;
 use std::ffi::CString;
 use std::ffi::NulError;
+use std::hash::{Hash, Hasher};
+use std::marker::PhantomData;
+use std::mem;
 use std::str::Utf8Error;
-use libc::c_char;
-use clingo_sys::*;
-pub use failure::Error;
+
+use failure::*;
+// pub use failure::Error;
 
 /// Functions and data structures to work with program ASTs.
 pub mod ast;