Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update Rust to 1.12.0-nightly (1deb02ea6 2016-08-12)
  • Loading branch information
nox committed Aug 13, 2016
1 parent 9f5122f commit fc6faf7
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion components/layout/fragment.rs
Expand Up @@ -23,7 +23,7 @@ use inline::{InlineMetrics, LAST_FRAGMENT_OF_ELEMENT};
use ipc_channel::ipc::IpcSender;
#[cfg(debug_assertions)]
use layout_debug;
use model::{self, Direction, IntrinsicISizes, IntrinsicISizesContribution, MaybeAuto, specified};
use model::{self, Direction, IntrinsicISizes, IntrinsicISizesContribution, MaybeAuto};
use msg::constellation_msg::PipelineId;
use net_traits::image::base::{Image, ImageMetadata};
use net_traits::image_cache_thread::{ImageOrMetadataAvailable, UsePlaceholder};
Expand Down
3 changes: 1 addition & 2 deletions components/net/fetch/cors_cache.rs
Expand Up @@ -12,8 +12,7 @@
use hyper::method::Method;
use net_traits::request::{CredentialsMode, Origin, Request};
use std::ascii::AsciiExt;
use time;
use time::{now, Timespec};
use time::{self, Timespec};
use url::Url;

/// Union type for CORS cache entries
Expand Down
4 changes: 2 additions & 2 deletions components/script/dom/request.rs
Expand Up @@ -507,13 +507,13 @@ fn includes_credentials(input: &Url) -> bool {

// TODO: `Readable Stream` object is not implemented in Servo yet.
// https://fetch.spec.whatwg.org/#concept-body-disturbed
fn request_is_disturbed(input: &Request) -> bool {
fn request_is_disturbed(_input: &Request) -> bool {
false
}

// TODO: `Readable Stream` object is not implemented in Servo yet.
// https://fetch.spec.whatwg.org/#concept-body-locked
fn request_is_locked(input: &Request) -> bool {
fn request_is_locked(_input: &Request) -> bool {
false
}

Expand Down
5 changes: 3 additions & 2 deletions components/servo/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion components/util/opts.rs
Expand Up @@ -15,7 +15,7 @@ use std::cmp;
use std::default::Default;
use std::env;
use std::fs::{self, File};
use std::io::{self, Read, Write, stderr};
use std::io::{self, Read, Write};
use std::path::{Path, PathBuf};
use std::process;
use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
Expand Down
2 changes: 1 addition & 1 deletion rust-nightly-date
@@ -1 +1 @@
2016-08-05
2016-08-13
2 changes: 1 addition & 1 deletion tests/compiletest/helper/Cargo.toml
Expand Up @@ -10,4 +10,4 @@ path = "lib.rs"
doctest = false

[dependencies]
compiletest_rs = "0.1.3"
compiletest_rs = "0.2.0"

0 comments on commit fc6faf7

Please sign in to comment.