Fix build errors in rust-encoding by updating to 40717f5

Author: Mark-Simulacrum

rust-encoding-0.3.0/.gitignore

@@ -0,0 +1,3 @@
+target
+Cargo.lock
+src/index/.cache

rust-encoding-0.3.0/.travis.yml

@@ -0,0 +1,9 @@
+language: rust
+rust: nightly
+os:
+  - linux
+  - osx
+script:
+  - cargo build -v
+  - make test
+  - cargo doc

rust-encoding-0.3.0/AUTHORS.txt

@@ -0,0 +1,35 @@
+Encoding is mainly written by Kang Seonghoon <[email protected]>,
+and also the following people (in ascending order):
+
+Aaron Weiss <[email protected]>
+Alex Crichton <[email protected]>
+Andrew Cann <[email protected]>
+Aneesh Agrawal <[email protected]>
+Björn Steinbrink <[email protected]>
+Brian Koropoff <[email protected]>
+Clark Gaebel <[email protected]>
+D.K <[email protected]>
+Filipe Gonçalves <[email protected]>
+Florian Gilcher <[email protected]>
+Frank Denis <[email protected]>
+Jack Moffitt <[email protected]>
+Jason Ozias <[email protected]>
+Jason Ozias <[email protected]>
+Joonas Javanainen <[email protected]>
+Joshua DeSeno <[email protected]>
+Keegan McAllister <[email protected]>
+Ken Tossell <[email protected]>
+Kyle Dewey <[email protected]>
+Manish Goregaokar <[email protected]>
+Matt Brubeck <[email protected]>
+Michael Neumann <[email protected]>
+Michael Sproul <[email protected]>
+Peter Atashian <[email protected]>
+Pierre Baillet <[email protected]>
+Robert Straw <[email protected]>
+Simon Sapin <[email protected]>
+Simonas Kazlauskas <[email protected]>
+Son <[email protected]>
+Steve Klabnik <[email protected]>
+klutzy <[email protected]>
+Сухарик <[email protected]>

rust-encoding-0.3.0/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "encoding"
-version = "0.2.32"
+version = "0.3.0-dev"
 authors = ["Kang Seonghoon <[email protected]>"]
 
 description = "Character encoding support for Rust"
@@ -14,6 +14,19 @@ license = "MIT"
 [lib]
 name = "encoding"
 
+[features]
+no-optimized-legacy-encoding = [
+	"encoding-index-singlebyte/no-optimized-legacy-encoding",
+	"encoding-index-korean/no-optimized-legacy-encoding",
+	"encoding-index-japanese/no-optimized-legacy-encoding",
+	"encoding-index-simpchinese/no-optimized-legacy-encoding",
+	"encoding-index-tradchinese/no-optimized-legacy-encoding",
+]
+
+[dependencies.encoding-types]
+version = "0.2"
+path = "src/types"
+
 # version policy for index tables:
 # - major: addition or deletion of index tables
 # - minor: any content changes to index tables, numbered by the date
@@ -23,25 +36,24 @@ name = "encoding"
 # so we should use tilde requirements here.
 
 [dependencies.encoding-index-singlebyte]
-version = "~1.20141219.5"
+version = "~1.20160120.0"
 path = "src/index/singlebyte"
 
 [dependencies.encoding-index-korean]
-version = "~1.20141219.5"
+version = "~1.20141219.6"
 path = "src/index/korean"
 
 [dependencies.encoding-index-japanese]
-version = "~1.20141219.5"
+version = "~1.20141219.6"
 path = "src/index/japanese"
 
 [dependencies.encoding-index-simpchinese]
-version = "~1.20141219.5"
+version = "~1.20160120.0"
 path = "src/index/simpchinese"
 
 [dependencies.encoding-index-tradchinese]
-version = "~1.20141219.5"
+version = "~1.20141219.6"
 path = "src/index/tradchinese"
 
 [dev-dependencies]
 getopts = "*" # for examples
-

rust-encoding.0.2.32/Cargo.toml renamed to rust-encoding-0.3.0/Cargo.toml

@@ -0,0 +1,41 @@
+.PHONY: all
+all:
+	@echo 'Try `cargo build` instead.'
+
+.PHONY: authors
+authors:
+	echo 'Encoding is mainly written by Kang Seonghoon <[email protected]>,' > AUTHORS.txt
+	echo 'and also the following people (in ascending order):' >> AUTHORS.txt
+	echo >> AUTHORS.txt
+	git log --format='%aN <%aE>' | grep -v 'Kang Seonghoon' | sort -u >> AUTHORS.txt
+
+.PHONY: test
+test:
+	# `test_correct_table` tests with indices with non-BMP mappings tend to be
+	# very slow without the optimization, so japanese and tradchinese got flags
+	cargo test -v
+	cargo test -v -p encoding-index-singlebyte
+	cargo test -v -p encoding-index-korean
+	RUSTFLAGS='-C opt-level=1' cargo test -v -p encoding-index-japanese
+	cargo test -v -p encoding-index-simpchinese
+	RUSTFLAGS='-C opt-level=1' cargo test -v -p encoding-index-tradchinese
+	cargo test -v -p encoding-types
+
+.PHONY: readme
+readme: README.md
+
+README.md: src/lib.rs
+	# really, really sorry for this mess.
+	awk '/^\/\/! # Encoding /{print "[Encoding][doc]",$$4}' $< > $@
+	awk '/^\/\/! # Encoding /{print "[Encoding][doc]",$$4}' $< | sed 's/./=/g' >> $@
+	echo >> $@
+	echo '[![Encoding on Travis CI][travis-image]][travis]' >> $@
+	echo >> $@
+	echo '[travis-image]: https://travis-ci.org/lifthrasiir/rust-encoding.png' >> $@
+	echo '[travis]: https://travis-ci.org/lifthrasiir/rust-encoding' >> $@
+	awk '/^\/\/! # Encoding /,/^\/\/! ## /' $< | cut -b 5- | grep -v '^#' >> $@
+	echo '[Complete Documentation][doc] (stable)' >> $@
+	echo >> $@
+	echo '[doc]: https://lifthrasiir.github.io/rust-encoding/' >> $@
+	echo >> $@
+	awk '/^\/\/! ## /,!/^\/\/!/' $< | cut -b 5- >> $@

rust-encoding.0.2.32/LICENSE.txt renamed to rust-encoding-0.3.0/LICENSE.txt

@@ -1,29 +1,29 @@
-// This is a part of rust-encoding.
-// Copyright (c) 2013-2015, Kang Seonghoon.
-// See README.md and LICENSE.txt for details.
+[Encoding][doc] 0.3.0-dev
+=========================
 
-/*!
+[![Encoding on Travis CI][travis-image]][travis]
 
-# Encoding 0.2.32
+[travis-image]: https://travis-ci.org/lifthrasiir/rust-encoding.png
+[travis]: https://travis-ci.org/lifthrasiir/rust-encoding
 
 Character encoding support for Rust. (also known as `rust-encoding`)
 It is based on [WHATWG Encoding Standard](http://encoding.spec.whatwg.org/),
 and also provides an advanced interface for error detection and recovery.
 
-## Usage
+*This documentation is for the development version (0.3).
+Please see the [stable documentation][doc] for 0.2.x versions.*
 
-Put this in your `Cargo.toml`:
+[Complete Documentation][doc] (stable)
 
-```toml
-[dependencies]
-encoding = "0.2"
-```
+[doc]: https://lifthrasiir.github.io/rust-encoding/
+
+## Usage
 
-Or in the case you are using Rust 1.0 beta, pin the exact version:
+Put this in your `Cargo.toml`:
 
 ```toml
 [dependencies]
-encoding = "=0.2.32"
+encoding = "0.3"
 ```
 
 Then put this in your crate root:
@@ -32,6 +32,22 @@ Then put this in your crate root:
 extern crate encoding;
 ```
 
+### Data Table
+
+By default, Encoding comes with ~480 KB of data table ("indices").
+This allows Encoding to encode and decode legacy encodings efficiently,
+but this might not be desirable for some applications.
+
+Encoding provides the `no-optimized-legacy-encoding` Cargo feature
+to reduce the size of encoding tables (to ~185 KB)
+at the expense of encoding performance (typically 5x to 20x slower).
+The decoding performance remains identical.
+**This feature is strongly intended for end users.
+Do not try to enable this feature from library crates, ever.**
+
+For finer-tuned optimization, see `src/index/gen_index.py` for
+custom table generation.
+
 ## Overview
 
 To encode a string:
@@ -156,7 +172,8 @@ There are two ways to get `Encoding`:
   You should use them when the encoding would not change or only handful of them are required.
   Combined with link-time optimization, any unused encoding would be discarded from the binary.
 * `encoding::label` has functions to dynamically get an encoding from given string ("label").
-  They will return a static reference to the encoding, which type is also known as `EncodingRef`.
+  They will return a static reference to the encoding,
+  which type is also known as `EncodingRef`.
   It is useful when a list of required encodings is not available in advance,
   but it will result in the larger binary and missed optimization opportunities.
 
@@ -211,66 +228,3 @@ The only standards reliable in this regard are WHATWG Encoding Standard and
 [vendor-provided mappings from the Unicode consortium](http://www.unicode.org/Public/MAPPINGS/).
 Whenever in doubt, look at the source code and specifications for detailed explanations.
 
-*/
-
-#![cfg_attr(test, feature(test))] // lib stability features as per RFC #507
-
-extern crate encoding_index_singlebyte as index_singlebyte;
-extern crate encoding_index_korean as index_korean;
-extern crate encoding_index_japanese as index_japanese;
-extern crate encoding_index_simpchinese as index_simpchinese;
-extern crate encoding_index_tradchinese as index_tradchinese;
-
-#[cfg(test)] extern crate test;
-
-pub use self::types::{CodecError, ByteWriter, StringWriter,
-                      RawEncoder, RawDecoder, EncodingRef, Encoding,
-                      EncoderTrapFunc, DecoderTrapFunc, DecoderTrap,
-                      EncoderTrap, decode}; // reexport
-
-#[macro_use] mod util;
-#[cfg(test)] #[macro_use] mod testutils;
-
-pub mod types;
-
-/// Codec implementations.
-pub mod codec {
-    pub mod error;
-    pub mod ascii;
-    pub mod singlebyte;
-    pub mod utf_8;
-    pub mod utf_16;
-    pub mod korean;
-    pub mod japanese;
-    pub mod simpchinese;
-    pub mod tradchinese;
-    pub mod whatwg;
-}
-
-pub mod all;
-pub mod label;
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_decode() {
-        fn test_one(input: &[u8], expected_result: &str, expected_encoding: &str) {
-            let (result, used_encoding) = decode(
-                input, DecoderTrap::Strict, all::ISO_8859_1 as EncodingRef);
-            let result = result.unwrap();
-            assert_eq!(used_encoding.name(), expected_encoding);
-            assert_eq!(&result[..], expected_result);
-        }
-
-        test_one(&[0xEF, 0xBB, 0xBF, 0xC3, 0xA9], "é", "utf-8");
-        test_one(&[0xC3, 0xA9], "é", "iso-8859-1");
-
-        test_one(&[0xFE, 0xFF, 0x00, 0xE9], "é", "utf-16be");
-        test_one(&[0x00, 0xE9], "\x00é", "iso-8859-1");
-
-        test_one(&[0xFF, 0xFE, 0xE9, 0x00], "é", "utf-16le");
-        test_one(&[0xE9, 0x00], "é\x00", "iso-8859-1");
-    }
-}