Skip to content

Commit

Permalink
ci: remove experimental features to ensure builds on stable are ok
Browse files Browse the repository at this point in the history
  • Loading branch information
shakyShane committed Oct 14, 2018
1 parent 55347de commit 5a4d363
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 7 deletions.
1 change: 0 additions & 1 deletion src/lib/bs.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![allow(dead_code)]
#![feature(extern_prelude)]
extern crate actix;
extern crate actix_web;
extern crate base64;
Expand Down
1 change: 1 addition & 0 deletions src/lib/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use from_file::FromFile;
use from_file::FromFileError;
use options::ConfigError;
use serde_yaml::Value;
use std;

#[derive(Deserialize, Debug, Clone)]
pub struct ProgramConfig {
Expand Down
1 change: 1 addition & 0 deletions src/lib/from_file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ extern crate serde_json;
extern crate serde_yaml;

use serde::Deserialize;
use std;
use std::fs::File;
use std::io::prelude::*;
use std::path::PathBuf;
Expand Down
1 change: 1 addition & 0 deletions src/lib/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use clap::Arg;
use clap::ArgMatches;
use clap::Error;
use config::ProgramStartError;
use std;
use std::ffi::OsString;
use std::fmt;
use url::ParseError;
Expand Down
1 change: 1 addition & 0 deletions src/lib/presets/m2/handlers/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use actix_web::HttpRequest;
use actix_web::HttpResponse;
use preset::AppState;
use presets::m2::state::gather_state;
use serde_json;

///
/// This handler will serve up JSON that
Expand Down
1 change: 1 addition & 0 deletions src/lib/presets/m2/handlers/config.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use actix_web::HttpRequest;
use actix_web::HttpResponse;
use preset::AppState;
use serde_json;

///
/// This handler will just serve back the RequireJS config as
Expand Down
2 changes: 2 additions & 0 deletions src/lib/presets/m2/handlers/config_post.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ use futures::{Future, Stream};
use preset::AppState;
use presets::m2::preset_m2::FutResp;
use presets::m2::requirejs_config::RequireJsClientConfig;
use serde_json;
use std;

///
/// This handler accepts the incoming RequireJS merged
Expand Down
1 change: 1 addition & 0 deletions src/lib/presets/m2/handlers/err_response.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use actix_web::http::StatusCode;
use actix_web::HttpResponse;
use serde_json;

pub fn create(message: String) -> HttpResponse {
HttpResponse::Ok()
Expand Down
1 change: 1 addition & 0 deletions src/lib/presets/m2/handlers/req_capture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use actix_web::middleware::Middleware;
use actix_web::{HttpRequest, HttpResponse};
use preset::AppState;
use presets::m2::module_meta_data::ModuleData;
use serde_json;

pub struct ReqCapture {}

Expand Down
1 change: 1 addition & 0 deletions src/lib/presets/m2/handlers/requests.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use actix_web::HttpRequest;
use actix_web::HttpResponse;
use preset::AppState;
use serde_json;

///
/// serve a JSON dump of the current request log
Expand Down
1 change: 1 addition & 0 deletions src/lib/presets/m2/handlers/seed.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use actix_web::{HttpRequest, HttpResponse};
use preset::AppState;
use presets::m2::seed::SeedData;
use serde_json;

///
/// The seed allows you to rehydrate the AppState
Expand Down
1 change: 1 addition & 0 deletions src/lib/presets/m2/opts.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use config::ProgramConfig;
use serde_yaml;

#[derive(Deserialize, Debug)]
pub struct M2PresetOptions {
Expand Down
1 change: 1 addition & 0 deletions src/lib/presets/m2/requirejs_config.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use from_file::FromFile;
use presets::m2::bundle_config::Module;
use presets::m2::module_meta_data::ModuleData;
use serde_json;
use std::collections::HashMap;
use url::Url;

Expand Down
1 change: 1 addition & 0 deletions src/lib/setup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use presets::m2::preset_m2::M2Preset;
use presets::m2::requirejs_config::RequireJsClientConfig;
use presets::m2::seed::SeedData;
use proxy_transform::proxy_transform;
use serde_yaml;
use std::collections::HashMap;
use std::sync::Arc;
use std::sync::Mutex;
Expand Down
12 changes: 6 additions & 6 deletions tests/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ const DEFAULT_ARGS: &'static [&'static str] = &[
fn test_config_json() {
api(DEFAULT_ARGS.to_vec(), "/__bs/config.json", |result| {
let (_sys, _url, mut res) = result.expect("api returned");
let _c: RequireJsClientConfig = serde_json::from_str(
&res.text().expect("unwrap text response"),
).expect("serde deserialize");
let _c: RequireJsClientConfig =
serde_json::from_str(&res.text().expect("unwrap text response"))
.expect("serde deserialize");
});
}

Expand All @@ -53,9 +53,9 @@ fn test_loaders_js() {
fn test_build_json() {
api(DEFAULT_ARGS.to_vec(), "/__bs/build.json", |result| {
let (_sys, _url, mut res) = result.expect("api returned");
let _c: RequireJsBuildConfig = serde_json::from_str(
&res.text().expect("unwrap text response"),
).expect("serde deserialize");
let _c: RequireJsBuildConfig =
serde_json::from_str(&res.text().expect("unwrap text response"))
.expect("serde deserialize");
});
}

Expand Down

0 comments on commit 5a4d363

Please sign in to comment.