Skip to content
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.

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

Update Rust to 1.12.0-nightly (1deb02ea6 2016-08-12) #12846

Merged
merged 3 commits into from Aug 13, 2016
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -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};
@@ -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
@@ -10,9 +10,6 @@ name = "plugins"
path = "lib.rs"
plugin = true

[dependencies]
tenacious = "0.2.0"

[dependencies.clippy_lints]
version = "0.0.77"
optional = true
@@ -25,7 +25,6 @@ extern crate rustc_plugin;
#[macro_use]
extern crate syntax;
extern crate syntax_ext;
extern crate tenacious;

use rustc_plugin::Registry;
use syntax::ext::base::*;
@@ -53,7 +52,6 @@ pub fn plugin_registrar(reg: &mut Registry) {
reg.register_late_lint_pass(box lints::inheritance_integrity::InheritancePass);
reg.register_late_lint_pass(box lints::transmute_type::TransmutePass);
reg.register_early_lint_pass(box lints::ban::BanPass);
reg.register_late_lint_pass(box tenacious::TenaciousPass);
reg.register_attribute("must_root".to_string(), Whitelisted);
reg.register_attribute("servo_lang".to_string(), Whitelisted);
reg.register_attribute("allow_unrooted_interior".to_string(), Whitelisted);
@@ -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
}

Some generated files are not rendered by default. Learn more.

@@ -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};

Some generated files are not rendered by default. Learn more.

@@ -1 +1 @@
2016-08-05
2016-08-13
@@ -10,4 +10,4 @@ path = "lib.rs"
doctest = false

[dependencies]
compiletest_rs = "0.1.3"
compiletest_rs = "0.2.0"
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.