facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-12-28 07:33:10 +03:00
Code Issues Projects Releases Wiki Activity

bindings: update to rust-cpython 0.4

Browse Source 
Summary: Update to the new version of rust-cpython.  This supports `list.append`, so make use of it.

Reviewed By: xavierd

Differential Revision: D19590905

fbshipit-source-id: 03609d4f698ae8e4380e82b8144caaa205b4c2d4
This commit is contained in:
Mark Thomas 2020-01-28 10:44:31 -08:00 committed by Facebook Github Bot
parent 455fdf8461
commit 4fe02f3607
34 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eden/scm/edenscmnative/bindings/Cargo.toml
View File

@ -12,7 +12,7 @@ incremental = true
lto = false lto = false
[dependencies] [dependencies]
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
env_logger = "0.7" env_logger = "0.7"
pyblackbox = { path = "modules/pyblackbox" } pyblackbox = { path = "modules/pyblackbox" }
pybookmarkstore = { path = "modules/pybookmarkstore" } pybookmarkstore = { path = "modules/pybookmarkstore" }

2
eden/scm/edenscmnative/bindings/modules/pyblackbox/Cargo.toml
View File

@ -6,4 +6,4 @@ edition = "2018"
[dependencies] [dependencies]
blackbox = { path = "../../../../lib/blackbox" } blackbox = { path = "../../../../lib/blackbox" }
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }

2
eden/scm/edenscmnative/bindings/modules/pybookmarkstore/Cargo.toml
View File

@ -5,6 +5,6 @@ edition = "2018"
[dependencies] [dependencies]
bookmarkstore = { path = "../../../../lib/bookmarkstore" } bookmarkstore = { path = "../../../../lib/bookmarkstore" }
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
types = { path = "../../../../lib/types" } types = { path = "../../../../lib/types" }

2
eden/scm/edenscmnative/bindings/modules/pycliparser/Cargo.toml
View File

@ -7,5 +7,5 @@ edition = "2018"
clidispatch = { path = "../../../../lib/clidispatch" } clidispatch = { path = "../../../../lib/clidispatch" }
cliparser = { path = "../../../../lib/cliparser", features = ["python"] } cliparser = { path = "../../../../lib/cliparser", features = ["python"] }
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
pyconfigparser = { path = "../pyconfigparser" } pyconfigparser = { path = "../pyconfigparser" }

2
eden/scm/edenscmnative/bindings/modules/pycommands/Cargo.toml
View File

@ -6,5 +6,5 @@ edition = "2018"
[dependencies] [dependencies]
clidispatch = { path = "../../../../lib/clidispatch" } clidispatch = { path = "../../../../lib/clidispatch" }
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
hgcommands = { path = "../../../../lib/hgcommands" } hgcommands = { path = "../../../../lib/hgcommands" }

2
eden/scm/edenscmnative/bindings/modules/pyconfigparser/Cargo.toml
View File

@ -6,6 +6,6 @@ edition = "2018"
[dependencies] [dependencies]
bytes = "0.4.11" bytes = "0.4.11"
configparser = { path = "../../../../lib/configparser" } configparser = { path = "../../../../lib/configparser" }
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
util = { path = "../../../../lib/util" } util = { path = "../../../../lib/util" }

2
eden/scm/edenscmnative/bindings/modules/pydag/Cargo.toml
View File

@ -5,6 +5,6 @@ edition = "2018"
[dependencies] [dependencies]
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
dag = { path = "../../../../lib/dag" } dag = { path = "../../../../lib/dag" }
anyhow = "1.0.20" anyhow = "1.0.20"

2
eden/scm/edenscmnative/bindings/modules/pyedenapi/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2018"
[dependencies] [dependencies]
bytes = "0.4" bytes = "0.4"
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
edenapi = { path = "../../../../lib/edenapi" } edenapi = { path = "../../../../lib/edenapi" }
pyrevisionstore = { path = "../pyrevisionstore" } pyrevisionstore = { path = "../pyrevisionstore" }
revisionstore = { path = "../../../../lib/revisionstore" } revisionstore = { path = "../../../../lib/revisionstore" }

2
eden/scm/edenscmnative/bindings/modules/pyerror/Cargo.toml
View File

@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
indexedlog = { path = "../../../../lib/indexedlog" } indexedlog = { path = "../../../../lib/indexedlog" }
metalog = { path = "../../../../lib/metalog" } metalog = { path = "../../../../lib/metalog" }

2
eden/scm/edenscmnative/bindings/modules/pyhgtime/Cargo.toml
View File

@ -4,6 +4,6 @@ version = "0.1.0"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
hgtime = { path = "../../../../lib/hgtime" } hgtime = { path = "../../../../lib/hgtime" }

4
eden/scm/edenscmnative/bindings/modules/pyindexes/Cargo.toml
View File

@ -15,9 +15,9 @@ anyhow = "1.0.20"
thiserror = "1.0.5" thiserror = "1.0.5"
[dependencies.cpython] [dependencies.cpython]
version = "0.3" version = "0.4"
default-features = false default-features = false
features = ["python27-sys"] features = ["python27-sys"]
[dependencies.python27-sys] [dependencies.python27-sys]
version = "0.3" version = "0.4"

2
eden/scm/edenscmnative/bindings/modules/pylz4/Cargo.toml
View File

@ -5,5 +5,5 @@ edition = "2018"
[dependencies] [dependencies]
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
lz4-pyframe = { path = "../../../../lib/lz4-pyframe" } lz4-pyframe = { path = "../../../../lib/lz4-pyframe" }

2
eden/scm/edenscmnative/bindings/modules/pymanifest/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
anyhow = "1.0.20" anyhow = "1.0.20"
bytes = { version = "0.4.11" } bytes = { version = "0.4.11" }
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
manifest = { path = "../../../../lib/manifest" } manifest = { path = "../../../../lib/manifest" }
manifest-tree = { path = "../../../../lib/manifest-tree" } manifest-tree = { path = "../../../../lib/manifest-tree" }
pathmatcher = { path = "../../../../lib/pathmatcher" } pathmatcher = { path = "../../../../lib/pathmatcher" }

2
eden/scm/edenscmnative/bindings/modules/pymetalog/Cargo.toml
View File

@ -4,6 +4,6 @@ version = "0.1.0"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
metalog = { path = "../../../../lib/metalog" } metalog = { path = "../../../../lib/metalog" }

2
eden/scm/edenscmnative/bindings/modules/pymutationstore/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
anyhow = "1.0.20" anyhow = "1.0.20"
byteorder = "1.2.7" byteorder = "1.2.7"
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
mutationstore = { path = "../../../../lib/mutationstore" } mutationstore = { path = "../../../../lib/mutationstore" }
thiserror = "1.0.5" thiserror = "1.0.5"
types = { path = "../../../../lib/types" } types = { path = "../../../../lib/types" }

2
eden/scm/edenscmnative/bindings/modules/pynodemap/Cargo.toml
View File

@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
nodemap = { path = "../../../../lib/nodemap" } nodemap = { path = "../../../../lib/nodemap" }
types = { path = "../../../../lib/types" } types = { path = "../../../../lib/types" }

2
eden/scm/edenscmnative/bindings/modules/pypathmatcher/Cargo.toml
View File

@ -5,7 +5,7 @@ edition = "2018"
[dependencies] [dependencies]
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
encoding = { path = "../../../../lib/encoding" } encoding = { path = "../../../../lib/encoding" }
pathmatcher = { path = "../../../../lib/pathmatcher" } pathmatcher = { path = "../../../../lib/pathmatcher" }
types = { path = "../../../../lib/types" } types = { path = "../../../../lib/types" }

2
eden/scm/edenscmnative/bindings/modules/pyrenderdag/Cargo.toml
View File

@ -4,6 +4,6 @@ version = "0.1.0"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
renderdag = { path = "../../../../lib/renderdag" } renderdag = { path = "../../../../lib/renderdag" }
parking_lot = "0.9" parking_lot = "0.9"

2
eden/scm/edenscmnative/bindings/modules/pyrevisionstore/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2018"
[dependencies] [dependencies]
anyhow = "1.0.20" anyhow = "1.0.20"
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
parking_lot = "0.9.0" parking_lot = "0.9.0"
pyconfigparser = { path = "../pyconfigparser" } pyconfigparser = { path = "../pyconfigparser" }
revisionstore = { path = "../../../../lib/revisionstore" } revisionstore = { path = "../../../../lib/revisionstore" }

2
eden/scm/edenscmnative/bindings/modules/pyrevisionstore/src/datastorepyext.rs
View File

@ -136,7 +136,7 @@ impl<T: DataStore + ?Sized> DataStorePyExt for T {
let results = PyList::new(py, &[]); let results = PyList::new(py, &[]);
for key in missing { for key in missing {
let key_tuple = from_key_to_tuple(py, &key); let key_tuple = from_key_to_tuple(py, &key);
results.insert_item(py, results.len(py), key_tuple.into_object()); results.append(py, key_tuple.into_object());
} }
Ok(results) Ok(results)

2
eden/scm/edenscmnative/bindings/modules/pyrevisionstore/src/historystorepyext.rs
View File

@ -59,7 +59,7 @@ impl<T: HistoryStore + ?Sized> HistoryStorePyExt for T {
let results = PyList::new(py, &[]); let results = PyList::new(py, &[]);
for key in missing { for key in missing {
let key_tuple = from_key_to_tuple(py, &key); let key_tuple = from_key_to_tuple(py, &key);
results.insert_item(py, results.len(py), key_tuple.into_object()); results.append(py, key_tuple.into_object());
} }
Ok(results) Ok(results)

2
eden/scm/edenscmnative/bindings/modules/pyrevisionstore/src/pythondatastore.rs
View File

@ -175,7 +175,7 @@ impl LocalStore for PythonDataStore {
let py_missing = PyList::new(py, &[]); let py_missing = PyList::new(py, &[]);
for key in keys.iter() { for key in keys.iter() {
let py_key = from_key_to_tuple(py, &key); let py_key = from_key_to_tuple(py, &key);
py_missing.insert_item(py, py_missing.len(py), py_key.into_object()); py_missing.append(py, py_key.into_object());
} }
let py_missing = self let py_missing = self

2
eden/scm/edenscmnative/bindings/modules/pyrevlogindex/Cargo.toml
View File

@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
dag = { path = "../../../../lib/dag" } dag = { path = "../../../../lib/dag" }
pydag = { path = "../pydag" } pydag = { path = "../pydag" }

2
eden/scm/edenscmnative/bindings/modules/pystackdesc/Cargo.toml
View File

@ -4,5 +4,5 @@ version = "0.1.0"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
stackdesc = { path = "../../../../lib/stackdesc/" } stackdesc = { path = "../../../../lib/stackdesc/" }

4
eden/scm/edenscmnative/bindings/modules/pythreading/Cargo.toml
View File

@ -9,9 +9,9 @@ lto = "thin"
[dependencies] [dependencies]
[dependencies.cpython] [dependencies.cpython]
version = "0.3" version = "0.4"
default-features = false default-features = false
features = ["python27-sys"] features = ["python27-sys"]
[dependencies.python27-sys] [dependencies.python27-sys]
version = "0.3" version = "0.4"

4
eden/scm/edenscmnative/bindings/modules/pytracing/Cargo.toml
View File

@ -10,11 +10,11 @@ python3 = []
[dependencies] [dependencies]
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
lazy_static = "1" lazy_static = "1"
mincode = { path = "../../../../lib/mincode" } mincode = { path = "../../../../lib/mincode" }
parking_lot = "0.9" parking_lot = "0.9"
python27-sys = "0.3" python27-sys = "0.4"
serde_json = "1" serde_json = "1"
tracing = "0.1" tracing = "0.1"
tracing-collector = { path = "../../../../lib/tracing-collector" } tracing-collector = { path = "../../../../lib/tracing-collector" }

2
eden/scm/edenscmnative/bindings/modules/pytreestate/Cargo.toml
View File

@ -6,5 +6,5 @@ edition = "2018"
[dependencies] [dependencies]
anyhow = "1.0.20" anyhow = "1.0.20"
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
treestate = { path = "../../../../lib/treestate" } treestate = { path = "../../../../lib/treestate" }

2
eden/scm/edenscmnative/bindings/modules/pyvlq/Cargo.toml
View File

@ -4,6 +4,6 @@ version = "0.1.0"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
vlqencoding = { path = "../../../../lib/vlqencoding" } vlqencoding = { path = "../../../../lib/vlqencoding" }

2
eden/scm/edenscmnative/bindings/modules/pyworkingcopy/Cargo.toml
View File

@ -5,7 +5,7 @@ edition = "2018"
[dependencies] [dependencies]
anyhow = "1.0.20" anyhow = "1.0.20"
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
encoding = { path = "../../../../lib/encoding" } encoding = { path = "../../../../lib/encoding" }
pathmatcher = { path = "../../../../lib/pathmatcher" } pathmatcher = { path = "../../../../lib/pathmatcher" }

2
eden/scm/edenscmnative/bindings/modules/pyzstd/Cargo.toml
View File

@ -5,6 +5,6 @@ edition = "2018"
[dependencies] [dependencies]
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
zstd = "0.4.18" zstd = "0.4.18"
zstdelta = { path = "../../../../lib/zstdelta/" } zstdelta = { path = "../../../../lib/zstdelta/" }

2
eden/scm/edenscmnative/bindings/modules/pyzstore/Cargo.toml
View File

@ -4,6 +4,6 @@ version = "0.1.0"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
cpython = { version = "0.3", features = ["python27-sys"], default-features = false } cpython = { version = "0.4", features = ["python27-sys"], default-features = false }
cpython-ext = { path = "../../../../lib/cpython-ext" } cpython-ext = { path = "../../../../lib/cpython-ext" }
zstore = { path = "../../../../lib/zstore" } zstore = { path = "../../../../lib/zstore" }

2
eden/scm/lib/cliparser/Cargo.toml
View File

@ -12,7 +12,7 @@ cpython-ext = { path = "../cpython-ext", optional = true }
thiserror = "1.0.5" thiserror = "1.0.5"
[dependencies.cpython] [dependencies.cpython]
version = "0.3" version = "0.4"
default-features = false default-features = false
features = ["python27-sys"] features = ["python27-sys"]
optional = true optional = true

4
eden/scm/lib/cpython-ext/Cargo.toml
View File

@ -17,9 +17,9 @@ parking_lot = "0.9"
serde = "1" serde = "1"
[dependencies.cpython] [dependencies.cpython]
version = "0.3" version = "0.4"
default-features = false default-features = false
features = ["python27-sys"] features = ["python27-sys"]
[dependencies.python27-sys] [dependencies.python27-sys]
version = "0.3" version = "0.4"

4
eden/scm/lib/hgcommands/Cargo.toml
View File

@ -36,9 +36,9 @@ zstd = "0.4"
path = "../encoding" path = "../encoding"
[dependencies.cpython] [dependencies.cpython]
version = "0.3" version = "0.4"
default-features = false default-features = false
features = ["python27-sys"] features = ["python27-sys"]
[dependencies.python27-sys] [dependencies.python27-sys]
version = "0.3" version = "0.4"