Skip to content

Commit

Permalink
Bug 1716709 - Remove RUSTC_BOOTSTRAP for xmldecl. r=glandium
Browse files Browse the repository at this point in the history
  • Loading branch information
hsivonen committed Jun 17, 2021
1 parent 3383cc3 commit b5366f5
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 27 deletions.
5 changes: 0 additions & 5 deletions .cargo/config.in
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@ git = "https://github.com/jfkthame/mapped_hyph.git"
replace-with = "vendored-sources"
rev = "746743227485a83123784df0c53227ab466612ed"

[source."https://github.com/hsivonen/xmldecl"]
git = "https://github.com/hsivonen/xmldecl"
replace-with = "vendored-sources"
rev = "a74f7df5bf6cb11194fb74daa0c3cf42f326fd90"

[source."https://github.com/hsivonen/packed_simd"]
git = "https://github.com/hsivonen/packed_simd"
replace-with = "vendored-sources"
Expand Down
3 changes: 2 additions & 1 deletion Cargo.lock

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

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/"
nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu5" }
minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "5cea1c9a3d8ed3ed2d7bdd5be3285e7821400b7f" }
xmldecl = { git = "https://github.com/hsivonen/xmldecl", rev="a74f7df5bf6cb11194fb74daa0c3cf42f326fd90" }

[patch.crates-io.cranelift-codegen]
git = "https://github.com/bytecodealliance/wasmtime"
Expand Down
2 changes: 1 addition & 1 deletion config/makefiles/rust.mk
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ endif
endif

ifndef RUSTC_BOOTSTRAP
RUSTC_BOOTSTRAP := gkrust_shared,qcms,xmldecl
RUSTC_BOOTSTRAP := gkrust_shared,qcms
ifdef MOZ_RUST_SIMD
RUSTC_BOOTSTRAP := $(RUSTC_BOOTSTRAP),encoding_rs,packed_simd
endif
Expand Down
2 changes: 1 addition & 1 deletion third_party/rust/xmldecl/.cargo-checksum.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"files":{".travis.yml":"409d24ad857b0a9ec60c9c6febb52ec63d70c18772ee74ed6c561b16e5cd80d4","COPYRIGHT":"12d3af8e034aee1d1955deb3797cb32fd7e014d1540a8714971238a35201fa0f","Cargo.toml":"3eb0cd408ec4c19ccb70a810f18beb6d50b4b16358f0f06be542c9f3d1a8d9c7","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"3fa4ca83dcc9237839b1bdeb2e6d16bdfb5ec0c5ce42b24694d8bbf0dcbef72c","README.md":"2b796024403be403370734e4e7f2ed9d668509ad256c903c80b131782ef8d241","build.rs":"69c9c9029ca969a4bb3f11429bc1424fa75af46143eb0d853b4db3a512859b32","src/lib.rs":"da2d41d0a699bfe14b09483d188f945075734fbfc07cf71d034fd41fb6f2df00"},"package":null}
{"files":{"COPYRIGHT":"12d3af8e034aee1d1955deb3797cb32fd7e014d1540a8714971238a35201fa0f","Cargo.toml":"95e515226b050b3c5e9bac1f8746663e31d88cdf89b304bf9344bfb9b7a71d9f","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"3fa4ca83dcc9237839b1bdeb2e6d16bdfb5ec0c5ce42b24694d8bbf0dcbef72c","README.md":"2b796024403be403370734e4e7f2ed9d668509ad256c903c80b131782ef8d241","src/lib.rs":"61b0d89890c57687ad04a27db31c9ee55e39ec0156c63db77a3176887dfacb3d"},"package":"e8c855a4ffa155714197d09677f21262f1d2e8d553fe5356c1752ad61f8a868c"}
5 changes: 0 additions & 5 deletions third_party/rust/xmldecl/.travis.yml

This file was deleted.

27 changes: 19 additions & 8 deletions third_party/rust/xmldecl/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
#
# When uploading crates to the registry Cargo will automatically
# "normalize" Cargo.toml files for maximal compatibility
# with all versions of Cargo and also rewrite `path` dependencies
# to registry (e.g., crates.io) dependencies
#
# If you believe there's an error in this file please file an
# issue against the rust-lang/cargo repository. If you're
# editing this file be aware that the upstream Cargo.toml
# will likely look very different (and much more reasonable)

[package]
edition = "2018"
name = "xmldecl"
version = "0.1.1"
authors = ["Henri Sivonen <[email protected]>"]
edition = "2018"
description = "Extracts an encoding from an ASCII-based bogo-XML declaration in text/html in a Web-compatible way"
license = "Apache-2.0 OR MIT"
readme = "README.md"
documentation = "https://docs.rs/xmldecl/"
homepage = "https://docs.rs/xmldecl/"
repository = "https://github.com/hsivonen/xmldecl"
documentation = "https://docs.rs/xmldecl/"
readme = "README.md"
keywords = ["encoding", "web", "unicode", "charset"]
categories = ["text-processing", "encoding", "web-programming", "internationalization"]

[dependencies]
encoding_rs = "0.8.0"
license = "Apache-2.0 OR MIT"
repository = "https://github.com/hsivonen/xmldecl"
[dependencies.encoding_rs]
version = "0.8.0"
3 changes: 0 additions & 3 deletions third_party/rust/xmldecl/build.rs

This file was deleted.

2 changes: 0 additions & 2 deletions third_party/rust/xmldecl/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
//! `xmldecl::parse()` extracts an encoding from an ASCII-based bogo-XML
//! declaration in `text/html` in a WebKit-compatible way.
#![feature(slice_strip)]

extern crate encoding_rs;

fn position(needle: u8, haystack: &[u8]) -> Option<usize> {
Expand Down

0 comments on commit b5366f5

Please sign in to comment.